Skip to content

Develop - #2

Open
Jmartelleti wants to merge 15 commits into
masterfrom
develop_
Open

Develop #2
Jmartelleti wants to merge 15 commits into
masterfrom
develop_

Conversation

@Jmartelleti

Copy link
Copy Markdown
Owner

No description provided.

Jmartelleti and others added 15 commits February 13, 2023 18:35
	deleted:    aplicacion/.gitignore
	deleted:    aplicacion/README.md
	deleted:    aplicacion/package-lock.json
	deleted:    aplicacion/package.json
	deleted:    aplicacion/public/favicon.ico
	deleted:    aplicacion/public/index.html
	deleted:    aplicacion/public/logo192.png
	deleted:    aplicacion/public/logo512.png
	deleted:    aplicacion/public/manifest.json
	deleted:    aplicacion/public/robots.txt
	deleted:    aplicacion/src/App.js
	deleted:    aplicacion/src/index.js
	deleted:    aplicacion/src/myComponents/Header.js
	modified:   wiki/__pycache__/__init__.cpython-310.pyc
	modified:   wiki/__pycache__/admin.cpython-310.pyc
	modified:   wiki/__pycache__/apps.cpython-310.pyc
	modified:   wiki/__pycache__/models.cpython-310.pyc
	modified:   wiki/__pycache__/serializers.cpython-310.pyc
	modified:   wiki/__pycache__/urls.cpython-310.pyc
	modified:   wiki/__pycache__/views.cpython-310.pyc
	modified:   wiki/migrations/__pycache__/0001_initial.cpython-310.pyc
	modified:   wiki/migrations/__pycache__/0002_alter_wiki_body.cpython-310.pyc
	modified:   wiki/migrations/__pycache__/__init__.cpython-310.pyc
	new file:   wiki/templates/index.html
	modified:   wiki/urls.py
	modified:   wiki/views.py
	modified:   wikideas/__pycache__/__init__.cpython-310.pyc
	modified:   wikideas/__pycache__/settings.cpython-310.pyc
	modified:   wikideas/__pycache__/urls.cpython-310.pyc
	modified:   wikideas/__pycache__/wsgi.cpython-310.pyc
	modified:   wikideas/settings.py
	new file:   static/css/bootstrap.min.css
	new file:   static/css/estilos.css
	new file:   static/img/01.jpg
	new file:   static/img/01.png
	new file:   static/img/02.jpg
	new file:   static/img/02.png
	new file:   static/img/03.jpg
	new file:   static/img/03.png
	new file:   static/img/04.png
	new file:   static/img/05.png
	new file:   static/img/06.png
	new file:   static/img/07.png
	new file:   static/img/08.png
	new file:   static/img/amarillo.jpg
	new file:   static/img/chica.jpg
	new file:   static/js/bootstrap.bundle.js
	new file:   static/js/bootstrap.bundle.min.js
	modified:   wiki/templates/index.html
	modified:   wikideas/__pycache__/__init__.cpython-311.pyc
	modified:   wikideas/__pycache__/settings.cpython-311.pyc
	modified:   wikideas/__pycache__/urls.cpython-311.pyc
    new file:   wiki/templates/generic.html
	modified:   wiki/templates/index.html
	modified:   wikideas/__pycache__/settings.cpython-310.pyc
	modified:   wikideas/settings.py
	deleted:    static/css/bootstrap.min.css
	deleted:    static/css/estilos.css
	new file:   static/css/fontawesome-all.min.css
	new file:   static/css/main.css
	new file:   static/css/noscript.css
	new file:   static/images/overlay.png
	deleted:    static/img/01.jpg
	deleted:    static/img/01.png
	deleted:    static/img/02.jpg
	deleted:    static/img/02.png
	deleted:    static/img/03.jpg
	deleted:    static/img/03.png
	deleted:    static/img/04.png
	deleted:    static/img/05.png
	deleted:    static/img/06.png
	deleted:    static/img/07.png
	deleted:    static/img/08.png
	deleted:    static/img/amarillo.jpg
	deleted:    static/img/chica.jpg
	deleted:    static/js/bootstrap.bundle.js
	deleted:    static/js/bootstrap.bundle.min.js
	new file:   static/js/breakpoints.min.js
	new file:   static/js/browser.min.js
	new file:   static/js/jquery.min.js
	new file:   static/js/jquery.scrollex.min.js
	new file:   static/js/jquery.scrolly.min.js
	new file:   static/js/main.js
	new file:   static/js/util.js
	new file:   static/sass/base/_page.scss
	new file:   static/sass/base/_reset.scss
	new file:   static/sass/base/_typography.scss
	new file:   static/sass/components/_actions.scss
	new file:   static/sass/components/_box.scss
	new file:   static/sass/components/_button.scss
	new file:   static/sass/components/_features.scss
	new file:   static/sass/components/_form.scss
	new file:   static/sass/components/_icon.scss
	new file:   static/sass/components/_icons.scss
	new file:   static/sass/components/_image.scss
	new file:   static/sass/components/_list.scss
	new file:   static/sass/components/_row.scss
	new file:   static/sass/components/_section.scss
	new file:   static/sass/components/_spotlight.scss
	new file:   static/sass/components/_statistics.scss
	new file:   static/sass/components/_table.scss
    new file:   static/sass/layout/_footer.scss
	new file:   static/sass/layout/_header.scss
    new file:   static/sass/layout/_main.scss
    new file:   static/sass/layout/_nav.scss
	new file:   static/sass/layout/_wrapper.scss
	new file:   static/sass/libs/_breakpoints.scss
	new file:   static/sass/libs/_functions.scss
    new file:   static/sass/libs/_html-grid.scss
	new file:   static/sass/libs/_mixins.scss
	new file:   static/sass/libs/_vars.scss
	new file:   static/sass/libs/_vendor.scss
	new file:   static/sass/main.scss
	new file:   static/sass/noscript.scss
	new file:   static/webfonts/fa-brands-400.eot
	new file:   static/webfonts/fa-brands-400.svg
	new file:   static/webfonts/fa-brands-400.ttf
	new file:   static/webfonts/fa-brands-400.woff
	new file:   static/webfonts/fa-brands-400.woff2
	new file:   static/webfonts/fa-regular-400.eot
	new file:   static/webfonts/fa-regular-400.svg
	new file:   static/webfonts/fa-regular-400.ttf
	new file:   static/webfonts/fa-regular-400.woff
	new file:   static/webfonts/fa-regular-400.woff2
	new file:   static/webfonts/fa-solid-900.eot
	new file:   static/webfonts/fa-solid-900.svg
	new file:   static/webfonts/fa-solid-900.ttf
	new file:   static/webfonts/fa-solid-900.woff
	new file:   static/webfonts/fa-solid-900.woff2
	modified:   wiki/templates/index.html
	modified:   wikideas/__pycache__/settings.cpython-310.pyc
	modified:   wikideas/settings.py
	deleted:    wiki/templates/generic.html
	deleted:    static/images/overlay.png
	new file:   static/images/pic01.jpg
	new file:   static/images/pic02.jpg
	new file:   static/images/pic03.jpg
	new file:   static/images/pic04.jpg
	new file:   static/images/pic05.jpg
	new file:   static/images/pic06.jpg
	modified:   wiki/__pycache__/urls.cpython-310.pyc
	modified:   wiki/__pycache__/views.cpython-310.pyc
	deleted:    wiki/serializers.py
	modified:   wiki/templates/index.html
	modified:   wiki/urls.py
	modified:   wiki/views.py
	new file:   wiki/__pycache__/admin.cpython-311.pyc
	new file:   wiki/__pycache__/apps.cpython-311.pyc
	new file:   wiki/__pycache__/models.cpython-311.pyc
	new file:   wiki/__pycache__/urls.cpython-311.pyc
	new file:   wiki/__pycache__/views.cpython-311.pyc
	new file:   wiki/migrations/__pycache__/0001_initial.cpython-311.pyc
	new file:   wiki/migrations/__pycache__/0002_alter_wiki_body.cpython-311.pyc
	new file:   wiki/migrations/__pycache__/__init__.cpython-311.pyc
	modified:   wikideas/__pycache__/__init__.cpython-311.pyc
	modified:   wikideas/__pycache__/settings.cpython-311.pyc
	modified:   wikideas/__pycache__/urls.cpython-311.pyc
	modified:   wikideas/__pycache__/wsgi.cpython-311.pyc
	new file:   static/css/bootstrap.min.css
	modified:   static/css/main.css
	modified:   static/css/noscript.css
	new file:   static/images/back.jpg
	new file:   static/images/hero.jpg
	new file:   static/images/image.png
	new file:   static/images/it_libro.jpg
	new file:   static/images/logo.png
	new file:   static/images/metallica.jpg
	new file:   static/images/stand.jpg
	new file:   static/images/visitante.png
	new file:   static/images/visitante_libro.jpg
	modified:   wiki/templates/index.html
	modified:   static/css/main.css
	modified:   static/css/noscript.css
	deleted:    static/images/back.jpg
	deleted:    static/images/hero.jpg
	deleted:    static/images/logo.png
	deleted:    static/images/metallica.jpg
	new file:   static/images/portada.png
	deleted:    static/images/stand.jpg
	deleted:    static/images/visitante.png
	deleted:    static/images/visitante_libro.jpg
	modified:   wiki/templates/index.html
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants