Commit Graph

327 Commits

Author SHA1 Message Date
Paola ea7db8269e merge conflict fix 2021-07-24 23:08:44 -06:00
Paola 6663fb729d agreacion contrasenna encuesta y arreglo cache 2021-07-24 22:53:38 -06:00
Pablo Bonilla 9fc9c133b1
Remove survey list error notification 2021-07-24 22:31:12 -06:00
Pablo Bonilla 68e4a27094
Add datasurvey custom filter styles 2021-07-24 22:25:03 -06:00
Pablo Bonilla e90c590f93
Fix survey list context menu 2021-07-24 22:12:50 -06:00
Eduardo Quiros 8c56917d03
Merge branch 'dev' into feature/US-57 2021-07-25 03:30:49 +00:00
Eduardo Quiros bea3cf9115
Merge branch 'dev' into feature/US-27 2021-07-25 03:23:22 +00:00
Pablo Bonilla 6f36c86cee
Merge branch 'dev' into feature/US-57 2021-07-24 21:20:27 -06:00
Pablo Bonilla 6ca152cc85
Change create survey questions tests 2021-07-24 21:18:32 -06:00
Mariela Bonilla 1d7499266a fix conflictos 2021-07-24 21:03:23 -06:00
Mariela Bonilla fdb36ce2d7 Merge branch 'dev' into feature/US-27 2021-07-24 20:42:45 -06:00
Pablo Bonilla 2473ffbc5a
Add create either closed or open question modal form 2021-07-24 20:38:37 -06:00
Mariela Bonilla feb91b1871 fix correo de usuarios 2021-07-24 20:34:40 -06:00
Mariela Bonilla 569b4703d8 Merge branch 'dev' into feature/US-64 2021-07-24 18:52:18 -06:00
Pablo Bonilla 28b291d031
Add delete option confirmation dialog 2021-07-24 18:44:26 -06:00
Mariela Bonilla c94ccc4332 add estilo de card a listar encuesta a usuario 2021-07-24 18:40:48 -06:00
Mariela Bonilla d400cbc2cb Merge branch 'dev' into feature/US-24 2021-07-24 18:29:18 -06:00
Mariela Bonilla faee58fcec Merge branch 'feature/US-57' into feature/US-29 2021-07-24 18:27:48 -06:00
Pablo Bonilla 0932e0c7b6
Add delete question confirmation dialog 2021-07-24 18:22:37 -06:00
Mariela Bonilla c9d0e9e69a update loading por defecto de jhipster 2021-07-24 18:13:09 -06:00
Mariela Bonilla abdf174b0f Merge branch 'dev' into feature/landing-page 2021-07-24 18:04:12 -06:00
Mariela Bonilla 485cea8ec1 pass spec home 2021-07-24 17:53:56 -06:00
Mariela Bonilla 93de9c8540 Merge branch 'dev' into feature/US-24 2021-07-24 17:30:42 -06:00
Mariela Bonilla 6a79ff975e fix de filtrar encuestas 2021-07-24 17:29:33 -06: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 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
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
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
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 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 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
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
Pablo Bonilla 6595d3257b
Fix add new question option text typo 2021-07-23 01:27:49 -06:00
Pablo Bonilla 6b8cbe8b96
Add ability to delete options from closed questions 2021-07-23 01:20:43 -06:00
Pablo Bonilla aeb5538a4a
Add modal for question option creation 2021-07-23 01:00:40 -06:00
Paola 24eaed7fbc areglo de mensajes en correos 2021-07-23 01:00:32 -06:00
Mariela Bonilla 69fdc4c2f5 add ver vista previa en listado 2021-07-23 00:58:40 -06:00
Paola b57f2d485f Verificacion de estado log in 2021-07-23 00:41:12 -06:00
Mariela Bonilla 3d7ec93084 Add opcion de ver vista previa en la lista de encuestas 2021-07-22 23:24:12 -06:00
Pablo Bonilla 679a238c13
Add draft and active validation for the delete question button 2021-07-22 21:49:13 -06:00
Pablo Bonilla d2fd23675a
Add delete open question from edit survey 2021-07-22 21:47:11 -06:00
Pablo Bonilla 03d285868c
Add edit survey list and delete closed question 2021-07-22 21:34:05 -06:00
Paola 262897d07c modificacion de estado en el user 2021-07-22 19:32:39 -06:00
Mariela Bonilla 813f40cf6a add en flltro la opción de filtrar por encuestas FINISHED 2021-07-22 02:52:06 -06:00
Mariela Bonilla 9f4f87ef41 add Eliminar encuesta 2021-07-22 02:49:12 -06:00
Paola b04c75edd2 envio de correos en cambio de estado usuario 2021-07-22 01:51:08 -06:00
Pablo Bonilla 28aec2e60d
Fix survey list share button pointer event 2021-07-22 00:28:08 -06:00
Mariela Bonilla 8eeb1b24ae Merge branch 'dev' into feature/US-24 2021-07-21 22:39:43 -06:00
Mariela Bonilla 9fd9e22739 add filter by acceso y estado 2021-07-21 22:30:54 -06:00
Pablo Bonilla 954d609ed5
Merge branch 'dev' into feature/US-57 2021-07-21 20:29:39 -06:00
Mariela Bonilla 8e22d769f6 add filtro de encuesta por nombre 2021-07-20 21:52:42 -06:00
Paola 15b3650697 arreglo de mensajes en alertas y correo 2021-07-19 15:46:24 -06:00
Pablo Bonilla 94d2bd402a
Merge branch 'dev' into feature/US-20 2021-07-19 12:05:40 -06:00
Mariela Bonilla d7c68cfe53 Merge branch 'dev' into feature/US-04 2021-07-19 01:33:10 -06:00
Mariela Bonilla d9b78e1332 fix test register 2021-07-19 01:27:51 -06:00
Eduardo Quiros 90274a529d
Merge pull request #50 from Quantum-P3/qa
deploy final, sprint 2
2021-07-19 07:08:23 +00:00
Paola 9ccfce7eac Merge branch 'dev' into feature/US-55 2021-07-19 00:53:03 -06:00
Paola 9cb69a29b7 arreglo alertas de errores 2021-07-19 00:51:15 -06:00
Mariela Bonilla e814ba1950 cambios en tests de usuarios 2021-07-19 00:46:38 -06:00
Mariela Bonilla feacf4ac97 Merge branch 'dev' into feature/US-04 2021-07-19 00:44:32 -06:00
Eduardo Quiros 71a82122de
Merge pull request #47 from Quantum-P3/qa
deploy #1 sprint 2
2021-07-19 06:15:30 +00:00
Eduardo Quiros 55134f0524
Merge branch 'fix/sprint-2/eduardo' into dev 2021-07-19 00:08:50 -06:00
Eduardo Quiros a7f6f67874
arreglar test 2021-07-19 00:08:18 -06:00
Mariela Bonilla ef49fd235a Merge branch 'dev' into feature/US-04 2021-07-18 23:56:34 -06:00
Paola 35d3f87069 arreglos mensajes de alerta en crear categorias 2021-07-18 23:46:51 -06:00
Mariela Bonilla f1879a396a Merge branch 'dev' into feature/US-04 2021-07-18 23:33:54 -06:00