Code

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

Code

Open

PedroCoza wants to merge 111 commits intoEGCETSII:masterEGCETSII/decide_django_2:masterfrom pabfrasan:developAuthenticationPedcozmatpabfrasan/decide:developAuthenticationPedcozmatCopy head branch name to clipboard

+2,769-68

Commits

Commits on Nov 3, 2020

• Primer commit

  pabfrasan

  committed
  f0e19c8

Commits on Nov 4, 2020

• local_settings subido

  pabfrasan

  committed
  8ca5c87

Commits on Nov 11, 2020

• Update .travis.yml

  pabfrasan

  authored
  27483fd

• Update .travis.yml

  pabfrasan

  authored
  7c48db0

• Update .travis.yml

  pabfrasan

  authored
  2783fc1

Commits on Nov 12, 2020

• Un cambio en el README

  pabfrasan

  committed
  ad8a86f

• Un cambio en el README

  AbrahamSFC

  committed
  3b7e21b

Commits on Nov 24, 2020

• Docker actualizado

  pabfrasan

  committed
  4847ff9

Commits on Dec 10, 2020

• Heroku: añadido el Procfile

  pabfrasan

  committed
  2c2960f

• Configuracion Heroku

  pabfrasan

  committed
  e5cbb96

• Configuracion Heroku

  pabfrasan

  committed
  d144f14

• Configuracion Heroku

  pabfrasan

  committed
  06d68f2

• Configuracion Heroku

  pabfrasan

  committed
  63e0044

• Delete local_settings.py

  pabfrasan

  authored
  ef8247f

• Cambios de configuración. local_settings.py eliminado, cada usuario deberá agregar su archivo. Usuario de la db(decidedb): user=decide,pass=decide

  pabfrasan

  committed
  db74e05

Commits on Dec 17, 2020

• Update .travis.yml

  pabfrasan

  authored
  00a0fe3

• Update .travis.yml

  pabfrasan

  authored
  c6f8323

• Update .travis.yml

  pabfrasan

  authored
  db02351

• Update .travis.yml

  pabfrasan

  authored
  2474db5

• Update .travis.yml

  pabfrasan

  authored
  4a1ffb0

• Merge pull request #1 from pabfrasan/patch-1

  Show description for 0e652f2
  pabfrasan

  authored
  0e652f2

• Update .travis.yml

  pabfrasan

  authored
  ffad0fe

• travis_local_settings.py creado y .travis.yml actualizado

  pabfrasan

  committed
  838c812

• Integración de travis con heroku

  pabfrasan

  committed
  068c22f

Commits on Dec 19, 2020

• Dark mode and light mode implements

  

  marti

  authored and

  marti

  committed
  78b1e8e

• Floating action button implement

  

  marti

  authored and

  marti

  committed
  9e2ecc0

• Primera gráfica (donut)

  davsotpon

  committed
  42e5f55

• Merge branch 'developVisualizer' into Graficas

  davsotpon

  authored
  d899f6c

• Merge pull request #2 from pabfrasan/Graficas

  Show description for 4495197
  davsotpon

  authored
  4495197

• Footer fixed

  

  marti

  authored and

  marti

  committed
  b2445c6

• Delete footer.css

  Martinagr32

  authored
  892ea14

• popUp implement and footer.css remove

  

  marti

  authored and

  marti

  committed
  f107741

• popUp fixed

  

  marti

  authored and

  marti

  committed
  4228c6e

• popUp implements

  

  marti

  authored and

  marti

  committed
  996852f

• popUp implements

  

  marti

  authored and

  marti

  committed
  63767b8

Commits on Dec 21, 2020

• Internacionalización ingles-español

  

  marti

  authored and

  marti

  committed
  bd5879d

• Language switch functionality implemented

  

  marti

  authored and

  marti

  committed
  7ea44c3

• Merge pull request #3 from pabfrasan/developVisualizer

  Show description for 09a68ce
  Martinagr32

  authored
  09a68ce

Commits on Dec 22, 2020

• Change language in base.html and popUp visualization

  

  marti

  authored and

  marti

  committed
  7b8fd86

• Merge pull request #4 from pabfrasan/developVisualizerMartin

  Show description for 13d0cd6
  Martinagr32

  authored
  13d0cd6

Commits on Dec 26, 2020

• Add files via upload

  Show description for 3f85336
  Martinagr32

  authored
  3f85336

Commits on Jan 3, 2021

• Login, Basic Registration Form and Basic LogOut

  Show description for b818d5e
  Andagualh

  committed
  b818d5e

• Email verification function

  ivanhr3

  committed
  3f3fc3d

• Email Backend on Settings.py

  ivanhr3

  committed
  4fcfae9

• Facebook Social Login

  Show description for af0d394
  Andagualh

  committed
  af0d394

• Log in with Twitter functionality

  ivanhr3

  committed
  7dfa589

• Update requirements.txt

  ivanhr3

  authored
  645a426

• Little fixes on Register URL

  ivanhr3

  committed
  aa17f96

• Merge branch 'developAuthenticationIvaherrod1' of https://www.github.com/pabfrasan/decide into developAuthenticationIvaherrod1

  ivanhr3

  committed
  c7222e2

• Little fix on Account activation URL

  ivanhr3

  committed
  0ea7b2d

• Little fix on urls.py

  ivanhr3

  committed
  37652e8

• Merge remote-tracking branch 'origin/developAuthenticationIvaherrod1' into developAuthentication

  Andagualh

  committed
  ac483a4

Commits on Jan 5, 2021

• Changes on Login stylesheet

  ivanhr3

  committed
  b96c1c6

• Register Form Model Tests

  Andagualh

  committed
  b11cfc2

• Merge branch 'developAuthentication' into developAuthenticationAndagualh

  Andagualh

  committed
  2df04da

Commits on Jan 6, 2021

• New test for registration and some commentary

  Show description for 5d20ccf
  Andagualh

  committed
  5d20ccf

Commits on Jan 7, 2021

• Merge pull request #24 from pabfrasan/developAuthenticationAndagualh

  Show description for f2f1683
  Andagualh

  authored
  f2f1683

Commits on Jan 11, 2021

• New stylesheet for user register

  Show description for ef0b7de
  ivanhr3

  committed
  ef0b7de

• Little fixes on functions.js

  ivanhr3

  committed
  607a982

• Javascript import solved

  Show description for ead566e
  ivanhr3

  committed
  ead566e

• Merge pull request #93 from pabfrasan/developAuthenticationIvaherrod1

  Show description for b1c6470
  ivanhr3

  authored
  b1c6470

Commits on Jan 12, 2021

• Ver detalles de usuario

  Show description for 6959f8d
  pabmordel

  committed
  6959f8d

• Comprobar creación de Usuario

  Show description for 4b5c04c
  Andagualh

  committed
  4b5c04c

• Merge pull request #101 from pabfrasan/developAuthenticationAndagualh

  Show description for 56f1ee9
  ivanhr3

  authored
  56f1ee9

• Account activation invalid view changed

  Show description for e0019a1
  ivanhr3

  committed
  e0019a1

• New tests for register form

  Show description for eef2b33
  ivanhr3

  committed
  eef2b33

Commits on Jan 13, 2021

• Vista de editar usuario

  Show description for 352a028
  pabmordel

  committed
  352a028

• Editar usuario

  Show description for f21d313
  pabmordel

  committed
  f21d313

Commits on Jan 14, 2021

• Añadido settings.json a gitignore

  Show description for f2d9cc1
  PedroCoza

  committed
  f2d9cc1

• Test de formulario de registro

  Show description for 215b9aa
  Andagualh

  committed
  215b9aa

• Settings.json añadido a gitignore

  Show description for b36dfac
  pabmordel

  committed
  b36dfac

• Merge pull request #132 from pabfrasan/developAuthenticationPabmordel

  Show description for e90aab8
  pabmordel

  authored
  e90aab8

• Añadida página de Inicio

  Show description for 2f8faa9
  PedroCoza

  committed
  2f8faa9

• Merge branch 'developAuthentication' into developAuthenticationPedcozmat

  PedroCoza

  authored
  71486d4

• Merge pull request #137 from pabfrasan/developAuthenticationPedcozmat

  Show description for de31b7b
  PedroCoza

  authored
  de31b7b

• Botón de edición de perfil

  Show description for e49b03f
  pabmordel

  committed
  e49b03f

• Merge pull request #130 from pabfrasan/developAuthenticationAndagualh

  Show description for 2aa4755
  ivanhr3

  authored
  2aa4755

• Autorización de editar perfil

  Show description for 7678c77
  pabmordel

  committed
  7678c77

• Tests de Modelo añadidos

  Show description for 354e4f5
  Andagualh

  committed
  354e4f5

• Merge pull request #140 from pabfrasan/developAuthenticationAndagualh

  Show description for 3d4cfd1
  ivanhr3

  authored
  3d4cfd1

• Redirección tras edición de perfil

  Show description for 69e38eb
  pabmordel

  committed
  69e38eb

Commits on Jan 15, 2021

• Enlazar redes al editar perfil

  Show description for 39f193f
  pabmordel

  committed
  39f193f

• Actualizado maxlenght en Register.html

  Show description for 1c61aff
  Andagualh

  committed
  1c61aff

• Merge pull request #160 from pabfrasan/developAuthenticationAndagualh

  Show description for db05543
  ivanhr3

  authored
  db05543

• Mensajes de error en editar perfil

  Show description for cb004d6
  pabmordel

  committed
  cb004d6

• Añadido botón mi perfil

  Show description for e0da7a2
  PedroCoza

  committed
  e0da7a2

• New tests added to tests.py

  Show description for 310625a
  ivanhr3

  committed
  310625a

• Merge branch 'developAuthentication' into developAuthenticationIvaherrod1

  Andagualh

  authored
  e715bf0

• Merge pull request #167 from pabfrasan/developAuthenticationIvaherrod1

  Show description for 65825f7
  Andagualh

  authored
  65825f7

• Fijar email de usuario

  Show description for 8b5e631
  pabmordel

  committed
  8b5e631

• Merge pull request #169 from pabfrasan/developAuthenticationPedcozmat

  Show description for 810d2c1
  PedroCoza

  authored
  810d2c1

• Corregida la redirección tras el login

  Show description for 75f5278
  PedroCoza

  committed
  75f5278

• Merge pull request #172 from pabfrasan/developAuthenticationPabmordel

  Show description for e78fe66
  pabmordel

  authored
  e78fe66

• Añadido botón de cerrar sesíón en la página de inicio

  Show description for ce1046a
  PedroCoza

  committed
  ce1046a

• Merge pull request #180 from pabfrasan/developAuthenticationPedcozmat

  Show description for 33f7782
  PedroCoza

  authored
  33f7782

• Actualización de la Configuración

  Show description for 8dc23a1
  Andagualh

  committed
  8dc23a1

• Añadido nueva dependencia

  Show description for b48d81b
  Andagualh

  committed
  b48d81b

• Merge pull request #183 from pabfrasan/developAuthenticationAndagualh

  Show description for 9c3a8ba
  pabmordel

  authored
  9c3a8ba

• Revert "API Keys escondidas y cambiadas."

  pabmordel

  authored
  9dd5cad

• Merge pull request #184 from pabfrasan/revert-183-developAuthenticationAndagualh

  Show description for 5c99089
  pabmordel

  authored
  5c99089

• Revert "Revert "API Keys escondidas y cambiadas.""

  Andagualh

  authored
  edb72b8

• Merge pull request #185 from pabfrasan/revert-184-revert-183-developAuthenticationAndagualh

  Show description for e67150b
  Andagualh

  authored
  e67150b

• Añadido botón de borrado de cuenta

  Show description for 654d2bc
  PedroCoza

  committed
  654d2bc

• Merge branch 'developAuthentication' into developAuthenticationPedcozmat

  PedroCoza

  authored
  824dcaa

• Pequeño arreglo a la vista del perfil

  Show description for d6f611c
  PedroCoza

  committed
  d6f611c

Commits on Jan 16, 2021

• Añadida confirmación para la eliminación de cuentas

  Show description for 089efa6
  PedroCoza

  committed
  089efa6

• Añadido test de carga de login

  Show description for d4a8585
  PedroCoza

  committed
  d4a8585

• Mejorada la prueba de carga de autenticación

  Show description for 9d3e8aa
  PedroCoza

  committed
  9d3e8aa

• .vscode/settings.json -> .gitignore

  Show description for 2455f64
  PedroCoza

  committed
  2455f64

• Create loadTestUsers.json

  Show description for 9ee4a52
  PedroCoza

  committed
  9ee4a52

• Comentarios aclaratorios

  Show description for db9b5cd
  PedroCoza

  committed
  db9b5cd