Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Añadido botón de cerrar sesión #43

Open
wants to merge 111 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
f0e19c8
Primer commit
pabfrasan Nov 3, 2020
8ca5c87
local_settings subido
pabfrasan Nov 4, 2020
27483fd
Update .travis.yml
pabfrasan Nov 11, 2020
7c48db0
Update .travis.yml
pabfrasan Nov 11, 2020
2783fc1
Update .travis.yml
pabfrasan Nov 11, 2020
ad8a86f
Un cambio en el README
pabfrasan Nov 12, 2020
3b7e21b
Un cambio en el README
AbrahamSFC Nov 12, 2020
4847ff9
Docker actualizado
pabfrasan Nov 24, 2020
2c2960f
Heroku: añadido el Procfile
pabfrasan Dec 10, 2020
e5cbb96
Configuracion Heroku
pabfrasan Dec 10, 2020
d144f14
Configuracion Heroku
pabfrasan Dec 10, 2020
06d68f2
Configuracion Heroku
pabfrasan Dec 10, 2020
63e0044
Configuracion Heroku
pabfrasan Dec 10, 2020
ef8247f
Delete local_settings.py
pabfrasan Dec 10, 2020
db74e05
Cambios de configuración. local_settings.py eliminado, cada usuario d…
pabfrasan Dec 10, 2020
00a0fe3
Update .travis.yml
pabfrasan Dec 17, 2020
c6f8323
Update .travis.yml
pabfrasan Dec 17, 2020
db02351
Update .travis.yml
pabfrasan Dec 17, 2020
2474db5
Update .travis.yml
pabfrasan Dec 17, 2020
4a1ffb0
Update .travis.yml
pabfrasan Dec 17, 2020
0e652f2
Merge pull request #1 from pabfrasan/patch-1
pabfrasan Dec 17, 2020
ffad0fe
Update .travis.yml
pabfrasan Dec 17, 2020
838c812
travis_local_settings.py creado y .travis.yml actualizado
pabfrasan Dec 17, 2020
068c22f
Integración de travis con heroku
pabfrasan Dec 17, 2020
78b1e8e
Dark mode and light mode implements
Dec 19, 2020
9e2ecc0
Floating action button implement
Dec 19, 2020
42e5f55
Primera gráfica (donut)
davsotpon Dec 19, 2020
d899f6c
Merge branch 'developVisualizer' into Graficas
davsotpon Dec 19, 2020
4495197
Merge pull request #2 from pabfrasan/Graficas
davsotpon Dec 19, 2020
b2445c6
Footer fixed
Dec 19, 2020
892ea14
Delete footer.css
Martinagr32 Dec 19, 2020
f107741
popUp implement and footer.css remove
Dec 19, 2020
4228c6e
popUp fixed
Dec 19, 2020
996852f
popUp implements
Dec 19, 2020
63767b8
popUp implements
Dec 19, 2020
bd5879d
Internacionalización ingles-español
Dec 21, 2020
7ea44c3
Language switch functionality implemented
Dec 21, 2020
09a68ce
Merge pull request #3 from pabfrasan/developVisualizer
Martinagr32 Dec 21, 2020
7b8fd86
Change language in base.html and popUp visualization
Dec 22, 2020
13d0cd6
Merge pull request #4 from pabfrasan/developVisualizerMartin
Martinagr32 Dec 22, 2020
3f85336
Add files via upload
Martinagr32 Dec 26, 2020
b818d5e
Login, Basic Registration Form and Basic LogOut
Andagualh Jan 3, 2021
3f3fc3d
Email verification function
ivanhr3 Jan 3, 2021
4fcfae9
Email Backend on Settings.py
ivanhr3 Jan 3, 2021
af0d394
Facebook Social Login
Andagualh Jan 3, 2021
7dfa589
Log in with Twitter functionality
ivanhr3 Jan 3, 2021
645a426
Update requirements.txt
ivanhr3 Jan 3, 2021
aa17f96
Little fixes on Register URL
ivanhr3 Jan 3, 2021
c7222e2
Merge branch 'developAuthenticationIvaherrod1' of https://www.github.…
ivanhr3 Jan 3, 2021
0ea7b2d
Little fix on Account activation URL
ivanhr3 Jan 3, 2021
37652e8
Little fix on urls.py
ivanhr3 Jan 3, 2021
ac483a4
Merge remote-tracking branch 'origin/developAuthenticationIvaherrod1'…
Andagualh Jan 3, 2021
b96c1c6
Changes on Login stylesheet
ivanhr3 Jan 5, 2021
b11cfc2
Register Form Model Tests
Andagualh Jan 5, 2021
2df04da
Merge branch 'developAuthentication' into developAuthenticationAndagualh
Andagualh Jan 5, 2021
5d20ccf
New test for registration and some commentary
Andagualh Jan 6, 2021
f2f1683
Merge pull request #24 from pabfrasan/developAuthenticationAndagualh
Andagualh Jan 7, 2021
ef0b7de
New stylesheet for user register
ivanhr3 Jan 11, 2021
607a982
Little fixes on functions.js
ivanhr3 Jan 11, 2021
ead566e
Javascript import solved
ivanhr3 Jan 11, 2021
b1c6470
Merge pull request #93 from pabfrasan/developAuthenticationIvaherrod1
ivanhr3 Jan 11, 2021
6959f8d
Ver detalles de usuario
pabmordel Jan 12, 2021
4b5c04c
Comprobar creación de Usuario
Andagualh Jan 12, 2021
56f1ee9
Merge pull request #101 from pabfrasan/developAuthenticationAndagualh
ivanhr3 Jan 12, 2021
e0019a1
Account activation invalid view changed
ivanhr3 Jan 12, 2021
eef2b33
New tests for register form
ivanhr3 Jan 12, 2021
352a028
Vista de editar usuario
pabmordel Jan 13, 2021
f21d313
Editar usuario
pabmordel Jan 13, 2021
f2d9cc1
Añadido settings.json a gitignore
PedroCoza Jan 14, 2021
215b9aa
Test de formulario de registro
Andagualh Jan 14, 2021
b36dfac
Settings.json añadido a gitignore
pabmordel Jan 14, 2021
e90aab8
Merge pull request #132 from pabfrasan/developAuthenticationPabmordel
pabmordel Jan 14, 2021
2f8faa9
Añadida página de Inicio
PedroCoza Jan 14, 2021
71486d4
Merge branch 'developAuthentication' into developAuthenticationPedcozmat
PedroCoza Jan 14, 2021
de31b7b
Merge pull request #137 from pabfrasan/developAuthenticationPedcozmat
PedroCoza Jan 14, 2021
e49b03f
Botón de edición de perfil
pabmordel Jan 14, 2021
2aa4755
Merge pull request #130 from pabfrasan/developAuthenticationAndagualh
ivanhr3 Jan 14, 2021
7678c77
Autorización de editar perfil
pabmordel Jan 14, 2021
354e4f5
Tests de Modelo añadidos
Andagualh Jan 14, 2021
3d4cfd1
Merge pull request #140 from pabfrasan/developAuthenticationAndagualh
ivanhr3 Jan 14, 2021
69e38eb
Redirección tras edición de perfil
pabmordel Jan 14, 2021
39f193f
Enlazar redes al editar perfil
pabmordel Jan 15, 2021
1c61aff
Actualizado maxlenght en Register.html
Andagualh Jan 15, 2021
db05543
Merge pull request #160 from pabfrasan/developAuthenticationAndagualh
ivanhr3 Jan 15, 2021
cb004d6
Mensajes de error en editar perfil
pabmordel Jan 15, 2021
e0da7a2
Añadido botón mi perfil
PedroCoza Jan 15, 2021
310625a
New tests added to tests.py
ivanhr3 Jan 15, 2021
e715bf0
Merge branch 'developAuthentication' into developAuthenticationIvaher…
Andagualh Jan 15, 2021
65825f7
Merge pull request #167 from pabfrasan/developAuthenticationIvaherrod1
Andagualh Jan 15, 2021
8b5e631
Fijar email de usuario
pabmordel Jan 15, 2021
810d2c1
Merge pull request #169 from pabfrasan/developAuthenticationPedcozmat
PedroCoza Jan 15, 2021
75f5278
Corregida la redirección tras el login
PedroCoza Jan 15, 2021
e78fe66
Merge pull request #172 from pabfrasan/developAuthenticationPabmordel
pabmordel Jan 15, 2021
ce1046a
Añadido botón de cerrar sesíón en la página de inicio
PedroCoza Jan 15, 2021
33f7782
Merge pull request #180 from pabfrasan/developAuthenticationPedcozmat
PedroCoza Jan 15, 2021
8dc23a1
Actualización de la Configuración
Andagualh Jan 15, 2021
b48d81b
Añadido nueva dependencia
Andagualh Jan 15, 2021
9c3a8ba
Merge pull request #183 from pabfrasan/developAuthenticationAndagualh
pabmordel Jan 15, 2021
9dd5cad
Revert "API Keys escondidas y cambiadas."
pabmordel Jan 15, 2021
5c99089
Merge pull request #184 from pabfrasan/revert-183-developAuthenticati…
pabmordel Jan 15, 2021
edb72b8
Revert "Revert "API Keys escondidas y cambiadas.""
Andagualh Jan 15, 2021
e67150b
Merge pull request #185 from pabfrasan/revert-184-revert-183-developA…
Andagualh Jan 15, 2021
654d2bc
Añadido botón de borrado de cuenta
PedroCoza Jan 15, 2021
824dcaa
Merge branch 'developAuthentication' into developAuthenticationPedcozmat
PedroCoza Jan 15, 2021
d6f611c
Pequeño arreglo a la vista del perfil
PedroCoza Jan 15, 2021
089efa6
Añadida confirmación para la eliminación de cuentas
PedroCoza Jan 16, 2021
d4a8585
Añadido test de carga de login
PedroCoza Jan 16, 2021
9d3e8aa
Mejorada la prueba de carga de autenticación
PedroCoza Jan 16, 2021
2455f64
.vscode/settings.json -> .gitignore
PedroCoza Jan 16, 2021
9ee4a52
Create loadTestUsers.json
PedroCoza Jan 16, 2021
db9b5cd
Comentarios aclaratorios
PedroCoza Jan 16, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,5 @@ ENV/
.mypy_cache/

.vagrant
.vscode/settings.json
.vscode/settings.json
17 changes: 17 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>decide</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.python.pydev.PyDevBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.python.pydev.pythonNature</nature>
</natures>
</projectDescription>
5 changes: 5 additions & 0 deletions .pydevproject
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?><pydev_project>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
</pydev_project>
32 changes: 19 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
dist: xenial

services:
- postgresql
- postgresql
addons:
postgresql: "9.4"
postgresql: '9.4'
before_script:
- psql -U postgres -c "create user decide password 'decide'"
- psql -U postgres -c "create database test_decide owner decide"
- psql -U postgres -c "ALTER USER decide CREATEDB"
- psql -U postgres -c "create user decide password 'decide'"
- psql -U postgres -c "create database decidedb owner decide"
- psql -U postgres -c "ALTER USER decide CREATEDB"
language: python
python:
- "3.6"
- '3.6'
install:
- pip install -r requirements.txt
- pip install codacy-coverage
- pip install -r requirements.txt
- pip install codacy-coverage
script:
- cd decide
- coverage run --branch --source=. ./manage.py test --keepdb --with-xunit
- coverage xml
- python-codacy-coverage -r coverage.xml
- cd decide
- cp travis_local_settings.py local_settings.py
- coverage run --branch --source=. ./manage.py test mixnet --keepdb
- coverage xml
- python-codacy-coverage -r coverage.xml
deploy:
provider: heroku
app: picaro-decide
strategy: git
api_key:
secure: SDt7FSvAfUp9J0aA0vhQGKN7ZUfHvbyX/GMr/gVQmlkobFNWu9Wk8f5O2jzxEcHJfP9DKRPwzK5CF2d422bd/toKXEJldIoZL57YQnomlKElqetaLBoETyydhn/oZkkF+aTv/zZF92m2dQGetTlG6Zp1sqFSW9BwXFKBrMIh9XjqFton6AFDZ5DPCy6Gn9303OAkxtWmqG4EGTEzJ2VV9ambCEMs30ZSeAGn4eVbWC92CvSaef32aOBvKcHKSKIrBkN5Y0olYGHRj00s+tr0iBlVfxKyVb1lI6vwuuh85+8w2UGVXp+NCAEy+Dm1RLz3lhDi3hpIyXK1V9JCqw6arbuNgvB0vHvRuldAj8cw3lmpD9kLlmDfstyw5MJd8UAf22rwsI1nUA6Ga/qycAD1kOIOgPwF6oWLW16M+MOGE/+loZIj4NmQTs3wiYAemqwVqEHc9enViEAaSD2M2zUWPI7L2m9gd2iOll6UleKosqz9f8hQFBLKcaTuaoH5qRHAIPeSVIAZA+GmJhbj9lM++yVhZW5aJ0SVzx+RhGAXcgweVNtUIH8F2DU1Es001zNML90k+G47MpnGqfIHuZcxSVtttLS6raoJIHEQSNUzfwXsy4mBjnUzZvy4YeOf/DId8kb/Wrk0+8P/MOoaDVUEePae7rz4jRcHfHj1UXMPpd0=
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"python.pythonPath": "/usr/bin/python3"
}
4 changes: 4 additions & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
% prepara el repositorio para su despliegue.
release: sh -c 'cd decide && python manage.py migrate'
% especifica el comando para lanzar Decide
web: sh -c 'cd decide && gunicorn decide.wsgi --log-file -'
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
[![Build Status](https://travis-ci.com/wadobo/decide.svg?branch=master)](https://travis-ci.com/wadobo/decide) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=wadobo/decide&amp;utm_campaign=Badge_Grade) [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Coverage)

Prueba:
pabfrasan
abrgarvil
Plataforma voto electrónico educativa
=====================================

Expand Down
Loading