Code

Rota 2 hotfix 2#21

Code

Open

alegestor wants to merge 140 commits intodevelopDecide-Part-Rota/decide-part-rota-main:developfrom hotfix-alegestorDecide-Part-Rota/decide-part-rota-2:hotfix-alegestorCopy head branch name to clipboard

+2,170-2,240

Commits

Commits on Nov 20, 2022

• feature:Trying out the keys

  Icaro212

  committed
  3b22292

  Copy full SHA for 3b22292

Commits on Nov 22, 2022

• feat!: discord bot creation

  Show description for c010cac
  JStockwell

  committed
  c010cac

  Copy full SHA for c010cac

• feat:Prueba key ssh

  Pablosancval

  committed
  052e462

  Copy full SHA for 052e462

• feat:Prueba key ssh exitosa

  Pablosancval

  committed
  7caea15

  Copy full SHA for 7caea15

Commits on Nov 23, 2022

• feature:Working React on the decide aplication

  Icaro212

  committed
  45f72ae

  Copy full SHA for 45f72ae

• feat: test voting

  Show description for 17692c9
  JStockwell

  committed
  17692c9

  Copy full SHA for 17692c9

• fix: local_settings.example.py

  JStockwell

  committed
  895e26a

  Copy full SHA for 895e26a

• feat: list-votings get-votings reactivo

  Show description for c9f35aa
  JStockwell

  committed
  c9f35aa

  Copy full SHA for c9f35aa

Commits on Nov 24, 2022

• fix: correctiones miscelaneas

  Show description for 8f6ffa8
  JStockwell

  committed
  8f6ffa8

  Copy full SHA for 8f6ffa8

• feat:Añadidos dos primeros componentes de react y archivo css para la visualización de encuestas

  javiervaz01

  committed
  dc29694

  Copy full SHA for dc29694

• feature: first version of navegation bar

  Icaro212

  committed
  d0c7e19

  Copy full SHA for d0c7e19

• feat: Añadido un botón simple de react a la vista de la cabina de votación

  Pablosancval

  committed
  6cdb0aa

  Copy full SHA for 6cdb0aa

• Merge branch 'Rota2-018' of github.com:Decide-Part-Rota/decide-part-rota-2 into Rota2-018

  Pablosancval

  committed
  97f7c36

  Copy full SHA for 97f7c36

• Revert "Merge branch 'Rota2-018' of github.com:Decide-Part-Rota/decide-part-rota-2 into Rota2-018"

  Show description for d535f19
  Pablosancval

  committed
  d535f19

  Copy full SHA for d535f19

Commits on Nov 29, 2022

• Merge remote-tracking branch 'origin/master' into Rota2-004

  JStockwell

  committed
  c2ee5f7

  Copy full SHA for c2ee5f7

• Merge remote-tracking branch 'origin/develop' into Rota2-004

  JStockwell

  committed
  658960a

  Copy full SHA for 658960a

Commits on Dec 1, 2022

• fix: calling inactive votings

  JStockwell

  committed
  3ecce41

  Copy full SHA for 3ecce41

• Arreglo de rama Rota2-019

  alegestor

  committed
  e33945a

  Copy full SHA for e33945a

Commits on Dec 4, 2022

• Merge remote-tracking branch 'origin/develop' into Rota2-019

  alegestor

  committed
  8640304

  Copy full SHA for 8640304

Commits on Dec 7, 2022

• feat: bot_test created

  JStockwell

  committed
  bd0a375

  Copy full SHA for bd0a375

Commits on Dec 9, 2022

• fix: removed bot_test.py

  JStockwell

  committed
  e2a7133

  Copy full SHA for e2a7133

• feat: git-fame añadido a requirements

  JStockwell

  committed
  aea4e3c

  Copy full SHA for aea4e3c

• Merge pull request #22 from Decide-Part-Rota/develop

  Icaro212

  authored
  e77e0dd

  Copy full SHA for e77e0dd

• Merge remote-tracking branch 'origin/develop' into Rota2-019

  alegestor

  committed
  891fea8

  Copy full SHA for 891fea8

Commits on Dec 10, 2022

• feature: Añadido los nuevos listados y modifcaciones a las barra de navegación

  Icaro212

  committed
  5dfecfe

  Copy full SHA for 5dfecfe

• feature: Mergando cambios de develop a la rama para continuar trabajando

  Icaro212

  committed
  ff85aa2

  Copy full SHA for ff85aa2

Commits on Dec 11, 2022

• Feature: Arreglado componente para el título de la votación y estilos correspondientes

  javiervaz01

  committed
  875e2c9

  Copy full SHA for 875e2c9

• Merge remote-tracking branch 'origin/Rota2-001' into Rota2-019

  alegestor

  committed
  06c1be2

  Copy full SHA for 06c1be2

• feat: css y js aplicados a login

  alegestor

  committed
  1ff9850

  Copy full SHA for 1ff9850

• feat: Merge from Rota1-032 from necesary functionalities

  Icaro212

  committed
  6111cac

  Copy full SHA for 6111cac

• Revert "feat: Merge from Rota1-032 from necesary functionalities"

  Show description for c804a8d
  Icaro212

  committed
  c804a8d

  Copy full SHA for c804a8d

• fix: Local_sttings not importing fixed

  Icaro212

  committed
  ba61ba3

  Copy full SHA for ba61ba3

• Merge remote-tracking branch 'origin/Rota2-019' into Rota2-001

  Icaro212

  committed
  e0f299b

  Copy full SHA for e0f299b

• fix: margen de las tablas de login

  alegestor

  committed
  a1f4fed

  Copy full SHA for a1f4fed

• Merge remote-tracking branch 'origin/Rota2-019' into Rota2-001

  Icaro212

  committed
  65df110

  Copy full SHA for 65df110

• fix: Fixing a previous merge

  Icaro212

  committed
  9c93c53

  Copy full SHA for 9c93c53

Commits on Dec 12, 2022

• feature: pequeño avance hacia funcionalidad de mejorar cabina de votación

  javiervaz01

  committed
  a866a84

  Copy full SHA for a866a84

• feature: Added log responsive navbar to the booth

  Icaro212

  committed
  9e9aae7

  Copy full SHA for 9e9aae7

• feat: Merge Rota1-032 to develop the functionality

  Icaro212

  committed
  703f6bf

  Copy full SHA for 703f6bf

• fix: Fixed the merge from Rota1-032 manually

  Show description for 15553de
  Icaro212

  committed
  15553de

  Copy full SHA for 15553de

• feat: css y js aplicados al registro

  alegestor

  committed
  d728b0c

  Copy full SHA for d728b0c

• Merge remote-tracking branch 'origin/Rota2-001' into Rota2-019

  alegestor

  committed
  4f6c734

  Copy full SHA for 4f6c734

• Feat: welcome css y js

  alegestor

  committed
  b719b11

  Copy full SHA for b719b11

• fix: arreglo de html basico

  alegestor

  committed
  64ac462

  Copy full SHA for 64ac462

Commits on Dec 13, 2022

• feat: tests de login en selenium

  alegestor

  committed
  aeac420

  Copy full SHA for aeac420

• feat: Views Census addtion and User Voting

  Icaro212

  committed
  bb1872f

  Copy full SHA for bb1872f

• fix: añadida dependencia de selenium a requirements.txt

  alegestor

  committed
  67997b4

  Copy full SHA for 67997b4

• fix: selenium en requirements.txt

  alegestor

  committed
  7152029

  Copy full SHA for 7152029

• feat: test registro en selenium

  alegestor

  committed
  1ec4a1d

  Copy full SHA for 1ec4a1d

• Feat: adesión de selenium a requirements.txt

  alegestor

  committed
  ce1e9bf

  Copy full SHA for ce1e9bf

• fix: Minor codacy fixes

  Icaro212

  committed
  06bc194

  Copy full SHA for 06bc194

• fix: Minor codacy fixes

  Icaro212

  committed
  6e94214

  Copy full SHA for 6e94214

• fix: Minor codacy fixes again

  Icaro212

  committed
  686f2c2

  Copy full SHA for 686f2c2

Commits on Dec 14, 2022

• fix: Minor codacy fixes again

  Icaro212

  committed
  62babf3

  Copy full SHA for 62babf3

• fix: Minor codacy fixes again

  Icaro212

  committed
  7549712

  Copy full SHA for 7549712

• Merge pull request #27 from Decide-Part-Rota/Rota2-021

  Show description for 66380eb
  Icaro212

  authored
  66380eb

  Copy full SHA for 66380eb

• Merge remote-tracking branch 'origin/develop' into Rota2-019

  alegestor

  committed
  41d4745

  Copy full SHA for 41d4745

• Merge pull request #25 from Decide-Part-Rota/Rota2-001

  Show description for 9cd8e58
  alegestor

  authored
  9cd8e58

  Copy full SHA for 9cd8e58

• Feat: jss form implementado a login

  alegestor

  committed
  d021cdb

  Copy full SHA for d021cdb

• Merge remote-tracking branch 'origin/develop' into Rota2-019

  alegestor

  committed
  5350580

  Copy full SHA for 5350580

• Fix: codacy errors

  alegestor

  committed
  55f599c

  Copy full SHA for 55f599c

• Merge remote-tracking branch 'origin/develop' into Rota2-004

  JStockwell

  committed
  d8f9ce2

  Copy full SHA for d8f9ce2

• Fix: Codacy issues

  alegestor

  committed
  ad4de3b

  Copy full SHA for ad4de3b

• Fix: codacy errors (again)

  alegestor

  committed
  a6bd3d6

  Copy full SHA for a6bd3d6

• Merge pull request #28 from Decide-Part-Rota/Rota2-019

  Show description for 4547b2a
  Icaro212

  authored
  4547b2a

  Copy full SHA for 4547b2a

• Merge remote-tracking branch 'origin/develop' into Rota2-020

  alegestor

  committed
  d436065

  Copy full SHA for d436065

• Fix: codacy issues

  alegestor

  committed
  fd51f52

  Copy full SHA for fd51f52

• Fix: codacy issues (again)

  alegestor

  committed
  00601b5

  Copy full SHA for 00601b5

• fix: codacy (again x2)

  alegestor

  committed
  591b46a

  Copy full SHA for 591b46a

Commits on Dec 15, 2022

• Changes on how to take voting data to work with it in react, almost working

  javiervaz01

  committed
  2404a5f

  Copy full SHA for 2404a5f

• Merge pull request #30 from Decide-Part-Rota/Rota2-020

  Show description for 27aed4a
  Icaro212

  authored
  27aed4a

  Copy full SHA for 27aed4a

• Data finally taken from back to react, now just style needed

  javiervaz01

  committed
  3e53566

  Copy full SHA for 3e53566

Commits on Dec 16, 2022

• Merge remote-tracking branch 'origin/develop' into Rota2-004

  JStockwell

  committed
  025e3f0

  Copy full SHA for 025e3f0

• fix: requirements.txt

  JStockwell

  committed
  ab54d3a

  Copy full SHA for ab54d3a

• Merge branch 'develop' of github.com:Decide-Part-Rota/decide-part-rota-3 into Rota2-004

  JStockwell

  committed
  ad83ad0

  Copy full SHA for ad83ad0

• fix: forms regex login format

  JStockwell

  committed
  3ffe7b0

  Copy full SHA for 3ffe7b0

• feat: public filter

  JStockwell

  committed
  59999b2

  Copy full SHA for 59999b2

• fix: voting start create_pubkey

  JStockwell

  committed
  4bbd413

  Copy full SHA for 4bbd413

• fix: Traducción a ingles de autenticación y sus test

  alegestor

  committed
  951d4d5

  Copy full SHA for 951d4d5

• fix: codacy issues

  alegestor

  committed
  6042840

  Copy full SHA for 6042840

• test: Rota2-001 tests completed + Additional testing for auth

  Icaro212

  committed
  8bc042f

  Copy full SHA for 8bc042f

• Merge pull request #32 from Decide-Part-Rota/Rota2-019

  Show description for 8382fd6
  Icaro212

  authored
  8382fd6

  Copy full SHA for 8382fd6

Commits on Dec 17, 2022

• feat: initial post voting/person rest api

  JStockwell

  committed
  ac8ca6f

  Copy full SHA for ac8ca6f

• fix: function complexity refactor

  JStockwell

  committed
  05bfe4e

  Copy full SHA for 05bfe4e

• feat: vote posting message

  JStockwell

  committed
  9cbb1c6

  Copy full SHA for 9cbb1c6

• fix: Online testing working again

  Icaro212

  committed
  f24abdb

  Copy full SHA for f24abdb

• fix: Codacy errors corrected

  Icaro212

  committed
  6d2cdad

  Copy full SHA for 6d2cdad

• feat: untested elgamal encryption

  JStockwell

  committed
  dda1030

  Copy full SHA for dda1030

• fix: test bigpk removed

  JStockwell

  committed
  7b486a8

  Copy full SHA for 7b486a8

• test: test negativo contraseña limitar

  Pablosancval

  committed
  8fd7c9b

  Copy full SHA for 8fd7c9b

• test: test negativo contraseña muy corta

  Pablosancval

  committed
  60c2f82

  Copy full SHA for 60c2f82

• test: test negativo contraseña comun

  Pablosancval

  committed
  f8c34b9

  Copy full SHA for f8c34b9

• test: test negativo contraseña numérica

  Pablosancval

  committed
  b30c703

  Copy full SHA for b30c703

• test: test negativo mail sin @

  Pablosancval

  committed
  c43b3e6

  Copy full SHA for c43b3e6

• test: test negativo usuario vacío

  Pablosancval

  committed
  40174b8

  Copy full SHA for 40174b8

• fix: headless estaba en false

  Pablosancval

  committed
  e476b6e

  Copy full SHA for e476b6e

• fix: Codacy errors

  Icaro212

  committed
  84ab956

  Copy full SHA for 84ab956

• Merge remote-tracking branch 'origin/Rota2-004' into Rota2-024

  JStockwell

  committed
  36d756d

  Copy full SHA for 36d756d

• "feat: test suite registro

  JStockwell

  committed
  0d5cba7

  Copy full SHA for 0d5cba7

• fix: removed data print

  Pablosancval

  committed
  83d1bc2

  Copy full SHA for 83d1bc2

Commits on Dec 18, 2022

• All css and style almost finished

  javiervaz01

  committed
  cb5eb5f

  Copy full SHA for cb5eb5f

• feat: All css and react finished

  javiervaz01

  committed
  b3409b0

  Copy full SHA for b3409b0

• 2 first tests in selenium done, 4 remaining

  javiervaz01

  committed
  1c7b724

  Copy full SHA for 1c7b724

• !feat: Rota2-004 completado

  JStockwell

  committed
  ca7e66f

  Copy full SHA for ca7e66f

• fix: removed obsolete test_registro

  JStockwell

  committed
  d6c000e

  Copy full SHA for d6c000e

• fix: removed obsolete test.py selenium

  JStockwell

  committed
  1e18398

  Copy full SHA for 1e18398

• Merge branch 'develop' into Rota2-004

  JStockwell

  authored
  0cf54fb

  Copy full SHA for 0cf54fb

• fix: bot.py codacy

  JStockwell

  committed
  1e702b4

  Copy full SHA for 1e702b4

• fix: more codacy

  JStockwell

  committed
  8af899b

  Copy full SHA for 8af899b

• Tests finished

  javiervaz01

  committed
  0744378

  Copy full SHA for 0744378

• fix: misc fixes

  Pablosancval

  committed
  bc80a6f

  Copy full SHA for bc80a6f

• fix: bot.py formatting

  JStockwell

  committed
  08af607

  Copy full SHA for 08af607

• fix: more codacy

  Pablosancval

  committed
  edb914a

  Copy full SHA for edb914a

• fix: whitespace

  Pablosancval

  committed
  239e5f8

  Copy full SHA for 239e5f8

• Merge pull request #37 from Decide-Part-Rota/Rota2-004

  Show description for 93836ab
  Pablosancval

  authored
  93836ab

  Copy full SHA for 93836ab

• Merge remote-tracking branch 'origin/develop' into Rota2-024

  Pablosancval

  committed
  61ed4e8

  Copy full SHA for 61ed4e8

• fix: translation test

  Pablosancval

  committed
  c4ae5a2

  Copy full SHA for c4ae5a2

• Merge branch 'develop' into Rota2-022

  alegestor

  authored
  2158792

  Copy full SHA for 2158792

• Update test_selenium_login.py

  alegestor

  authored
  d636f41

  Copy full SHA for d636f41

• Merge pull request #35 from Decide-Part-Rota/Rota2-023

  Show description for eca8585
  alegestor

  authored
  eca8585

  Copy full SHA for eca8585

• Merge pull request #33 from Decide-Part-Rota/Rota2-022

  Show description for 53374ea
  alegestor

  authored
  53374ea

  Copy full SHA for 53374ea

• Merge remote-tracking branch 'origin/develop' into Rota2-024

  alegestor

  committed
  f9817b6

  Copy full SHA for f9817b6

• Tests fixed

  javiervaz01

  committed
  d773e22

  Copy full SHA for d773e22

• Merge pull request #38 from Decide-Part-Rota/Rota2-024

  Show description for aa00a23
  alegestor

  authored
  aa00a23

  Copy full SHA for aa00a23

• Merge branch 'develop' into Rota2-018

  javiervaz01

  authored
  f1e7740

  Copy full SHA for f1e7740

• Añadida etiqueta de skip a los tests de boothç

  javiervaz01

  committed
  bd0a220

  Copy full SHA for bd0a220

• Añadida etiqueta de skip a los tests de booth

  javiervaz01

  committed
  979bfba

  Copy full SHA for 979bfba

• Codacy problems fixed

  javiervaz01

  committed
  636458e

  Copy full SHA for 636458e

• minor codacy fix

  javiervaz01

  committed
  d50508b

  Copy full SHA for d50508b

• fix: fallos en codacy en style.css

  javiervaz01

  committed
  9057165

  Copy full SHA for 9057165

• fix: mas fallos en codacy en style.css

  javiervaz01

  committed
  ee73ec3

  Copy full SHA for ee73ec3

• Merge pull request #39 from Decide-Part-Rota/Rota2-018

  Show description for e8cb8f4
  Icaro212

  authored
  e8cb8f4

  Copy full SHA for e8cb8f4

• Revert "Rota2 018"

  Icaro212

  authored
  5cfdeba

  Copy full SHA for 5cfdeba

• Merge pull request #40 from Decide-Part-Rota/revert-39-Rota2-018

  Show description for 42da9ee
  Icaro212

  authored
  42da9ee

  Copy full SHA for 42da9ee

• Merge pull request #41 from Decide-Part-Rota/develop

  Show description for 61919d3
  javiervaz01

  authored
  61919d3

  Copy full SHA for 61919d3

• Feat: Toda la implementación de react y estilos de css añadidos debidos al problema de mergeo

  javiervaz01

  committed
  e7f8e98

  Copy full SHA for e7f8e98

• Fix: Print molesto eliminado de views.py

  javiervaz01

  committed
  763a367

  Copy full SHA for 763a367

• fix: Minor codacy fixes

  Icaro212

  committed
  37a2d32

  Copy full SHA for 37a2d32

• Merge pull request #42 from Decide-Part-Rota/Rota2-018

  Show description for de272f2
  Icaro212

  authored
  de272f2

  Copy full SHA for de272f2

• Merge pull request #43 from Decide-Part-Rota/develop

  Show description for 44f4df7
  JStockwell

  authored
  44f4df7

  Copy full SHA for 44f4df7