Commit Graph

430 Commits

Author SHA1 Message Date
Eduardo Quiros e4027a9b9b
Merge pull request #61 from Quantum-P3/feature/landing-page 2021-07-24 22:54:36 +00:00
Mariela Bonilla 7d61742e40 cambios de html despues de merge 2021-07-24 16:52:36 -06:00
Mariela Bonilla 3ae0019c99 Merge branch 'dev' into feature/US-24 2021-07-24 16:30:54 -06:00
Mariela Bonilla dd13d33f8c Merge branch 'dev' into feature/US-64 2021-07-24 16:02:13 -06:00
Mariela Bonilla 1acd33b5b5 Merge branch 'dev' into feature/US-27 2021-07-24 16:01:43 -06:00
Mariela Bonilla 017fdd9c0b Merge branch 'dev' into feature/US-29 2021-07-24 15:57:10 -06:00
Mariela Bonilla 41e6600b2d pass home spec 2021-07-24 15:42:25 -06:00
Mariela Bonilla 9b5eefe38a Merge branch 'dev' into feature/landing-page 2021-07-24 15:11:50 -06:00
Mariela Bonilla e322714caa Merge remote-tracking branch 'origin/dev' into dev 2021-07-24 15:10:09 -06:00
Mariela Bonilla a5b49c3959 Revert "Merge branch 'feature/landing-page' into dev"
This reverts commit 4a79244727.
2021-07-24 15:06:39 -06:00
Mariela Bonilla 4a79244727 Merge branch 'feature/landing-page' into dev 2021-07-24 15:06:15 -06:00
Mariela Bonilla c4bc0d2d9a add estilos para cards 2021-07-24 15:05:28 -06:00
Mariela Bonilla 973aea76fe dejar solo 3 encuestas, agregar footer, agregar boton encuestas 2021-07-24 14:36:13 -06:00
Pablo Bonilla 4ccf240bd1
Merge branch 'dev' into feature/US-57 2021-07-24 12:52:20 -06:00
Mariela Bonilla c305c1d369 add filtro por nombre en la pagina principal 2021-07-24 03:40:14 -06:00
Mariela Bonilla 4710ed3d8c actualizacion del loading de la plataforma 2021-07-24 02:58:08 -06:00
Mariela Bonilla 808847f541 add lista de encuestas a landing page, modificaciones para prototipo 2021-07-24 02:49:55 -06:00
Pablo Bonilla 78e58ab69a
Add create question to survey list of questions 2021-07-24 02:10:24 -06:00
Eduardo Quiros f4cbb86dfb
Merge pull request #60 from Quantum-P3/feature/US-22
filtrar encuestas por nombre con pipe
2021-07-24 06:07:49 +00:00
Pablo Bonilla 0af94cd9f2
Fix bug in list of survey questions and options 2021-07-23 23:58:25 -06:00
Eduardo Quiros af582345de
filtrar encuestas por nombre con pipe 2021-07-23 23:57:19 -06:00
Eduardo Quiros 2729910ce6
Merge pull request #54 from Quantum-P3/feature/US-12 2021-07-24 05:42:47 +00:00
Paola 3e459cd133 Merge branch 'dev' into feature/US-12 2021-07-23 23:33:40 -06:00
Paola a126a4ae81 fix test 2021-07-23 23:33:32 -06:00
Eduardo Quiros 49d721e32f
Merge pull request #59 from Quantum-P3/feature/US-41
Feature/us 41
2021-07-24 05:22:46 +00:00
Paola 4d7dd16756 Merge branch 'dev' into feature/US-12 2021-07-23 23:07:40 -06:00
Paola 5e4210bf8e fix test 2.0 2021-07-23 23:03:39 -06:00
Paola 9f2809f61b Merge branch 'dev' into feature/US-41 2021-07-23 23:00:47 -06:00
Paola e5f1770031 fix test 2021-07-23 22:59:31 -06:00
Paola dcd6dfd5ef validaciones publicar encuesta 2021-07-23 22:50:40 -06:00
Pablo Bonilla 2302a615b9
Fix loading empty survey questions 2021-07-23 22:13:57 -06:00
Eduardo Quiros b48360f9aa
Merge pull request #58 from Quantum-P3/feature/US-23
Eliminar encuestas
2021-07-24 03:30:25 +00:00
Eduardo Quiros d928c260bb
eliminar test dado que prueba una funcionalidad que ya no está 2021-07-23 21:24:36 -06:00
Eduardo Quiros 23265b5519
filtrar encuestas DELETED en TS en lugar de HTML 2021-07-23 21:11:06 -06:00
Eduardo Quiros fe26d6fca2
prefijar index sin usar con '_' 2021-07-23 21:03:21 -06:00
Eduardo Quiros 0389cade62
arreglar lenguaje de template 2021-07-23 20:59:03 -06:00
Eduardo Quiros 5f2ea19515
marcar encuesta como DELETED en lugar de eliminarla 2021-07-23 20:58:11 -06:00
Eduardo Quiros 915441b07f
arreglar checkeo de isAdmin 2021-07-23 20:58:11 -06:00
Pablo Bonilla 1f24b5de73
Fix sidebar full name, logout spelling and SVG font, and size 2021-07-23 20:56:13 -06:00
Eduardo Quiros 0d07c7adc3
Merge pull request #57 from Quantum-P3/feature/US-21
mostrar encuestas en tabla para admin
2021-07-24 02:24:51 +00:00
Eduardo Quiros 1316a51a86
mostrar información pertinente para el administrador en lugar de llenar la tabla 2021-07-23 20:07:16 -06:00
Eduardo Quiros 3cd2a41aa2
arreglar traducciones en listado de encuestas 2021-07-23 20:07:15 -06:00
Eduardo Quiros c5bead0483
mostrar encuestas en tabla para admin 2021-07-23 19:25:38 -06:00
Eduardo Quiros 6f3378cb05
Merge pull request #56 from Quantum-P3/qa 2021-07-24 00:46:36 +00:00
Eduardo Quiros 3dcc2af577
Merge pull request #55 from Quantum-P3/dev 2021-07-24 00:34:37 +00:00
Paola a03c351578 arreglo error de suspended en log in 2021-07-23 15:59:49 -06:00
Paola 0bd50e331c arreglo validacion log in suspended 2021-07-23 13:50:18 -06:00
Mariela Bonilla 3bd65155e7 Merge branch 'dev' into feature/landing-page 2021-07-23 02:13:39 -06:00
Mariela Bonilla 1f92b07d5b modiicacion de estilo en la tabla de lista de usuarios 2021-07-23 02:08:39 -06:00
Mariela Bonilla 00b4046ba1 Add filtrar usuario 2021-07-23 02:05:55 -06:00