Commit Graph

614 Commits

Author SHA1 Message Date
Eduardo Quiros d920ab39dc
Merge pull request #68 from Quantum-P3/fix/survey-contextmenu 2021-07-25 08:34:49 +00:00
Eduardo Quiros fefd4ad879
Merge pull request #69 from Quantum-P3/feature/US-12
Feature/us 12
2021-07-25 08:30:43 +00:00
Paola fcd87cb635 Arreglo mensajes alerta 2021-07-25 00:34:52 -06:00
Paola 4eec11079f Arreglo encuestas filter 2021-07-24 23:17:30 -06:00
Paola b5de3a3ee6 arreglo alerta categorias 2021-07-24 23:11:16 -06:00
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 4fddf0b130
Merge pull request #67 from Quantum-P3/feature/US-57 2021-07-25 03:41:12 +00:00
Eduardo Quiros 8c56917d03
Merge branch 'dev' into feature/US-57 2021-07-25 03:30:49 +00:00
Eduardo Quiros 1a42dcbab0
Merge pull request #66 from Quantum-P3/feature/US-27
add eliminar encuestas del usuario
2021-07-25 03:28: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
Eduardo Quiros a44419f097
Merge pull request #65 from Quantum-P3/feature/US-64 2021-07-25 02:45:52 +00: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
Eduardo Quiros cd2e7ed1e5
Merge pull request #63 from Quantum-P3/feature/US-24 2021-07-25 00:51:10 +00: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
Eduardo Quiros 8f10c73352
Merge pull request #62 from Quantum-P3/feature/landing-page 2021-07-25 00:26:13 +00: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
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