Commit Graph

487 Commits

Author SHA1 Message Date
Pablo Bonilla 2e9564577f
Fix typo in password reset (finish state) 2021-07-29 21:26:19 -06:00
Mariela Bonilla 119290ecfa Merge branch 'dev' into feature/US-61 2021-07-29 21:21:27 -06:00
Eduardo Quiros b3b0f01db6
Merge pull request #93 from Quantum-P3/fix/lista-encuestas
fix del forbidden del listar encuesta y la muestra de fecha de vista previa
2021-07-30 03:12:17 +00:00
Mariela Bonilla 34c1076813 fix de del forbidden de la lista de encuesta y la fecha de vista previa 2021-07-29 20:17:16 -06:00
Pablo Bonilla 300f20affd
Add update survey 2021-07-29 02:10:39 -06:00
Eduardo Quiros bf04adc0ee
Merge pull request #92 from Quantum-P3/dev
Merge pull request #91 from Quantum-P3/main
2021-07-29 07:36:41 +00:00
Eduardo Quiros e5978890a8
Merge pull request #91 from Quantum-P3/main
Main
2021-07-29 07:26:51 +00:00
Mariela Bonilla 67a536989e add icono para agregar colaborador 2021-07-29 01:01:43 -06:00
Eduardo Quiros aabbecd43e
Merge pull request #90 from Quantum-P3/qa
dep
2021-07-29 06:30:51 +00:00
Eduardo Quiros e822e671c7
Merge pull request #89 from Quantum-P3/dev
QA
2021-07-29 06:23:02 +00:00
Eduardo Quiros 4cc71ac5dc
Merge pull request #88 from Quantum-P3/feature/US-25
agregacion pagina principal y arreglo footer
2021-07-29 06:18:05 +00:00
Paola ceb589ac20 eliminar punto en archivo activate 2021-07-28 23:38:49 -06:00
Paola 4b0a566537 agregacion pagina principal y arreglo footer 2021-07-28 23:26:29 -06:00
Mariela Bonilla 4a1393f804 Merge branch 'dev' into feature/US-61 2021-07-28 21:00:29 -06:00
Mariela Bonilla d4cda420de add mostrar colaboradores de una encuesta 2021-07-28 01:08:11 -06:00
Eduardo Quiros 340bfbb67f
Merge pull request #87 from Quantum-P3/qa
Qa
2021-07-28 05:44:54 +00:00
Eduardo Quiros 6f154c97e6
Merge pull request #86 from Quantum-P3/main
Main
2021-07-28 05:44:41 +00:00
Eduardo Quiros 64f2dfd8ee
Merge pull request #85 from Quantum-P3/dev
fix deploy
2021-07-28 05:44:23 +00:00
Eduardo Quiros ce78cc4b65
Merge pull request #84 from Quantum-P3/fix/user-list-edit-button
Remove view button from user list
2021-07-28 05:42:58 +00:00
Pablo Bonilla 26af353c3b
Remove view button from user list 2021-07-27 23:39:28 -06:00
Eduardo Quiros f838fc11a2
Merge pull request #83 from Quantum-P3/fix/delete-survey-user
Fix delete user survey
2021-07-28 05:07:59 +00:00
Pablo Bonilla b0c994bc42
Fix delete user survey 2021-07-27 23:01:53 -06:00
Eduardo Quiros 1e389341db
Merge pull request #81 from Quantum-P3/main
Main to dev
2021-07-27 07:46:14 +00:00
Eduardo Quiros 654b10ba62
Merge pull request #82 from Quantum-P3/main
Main to QA
2021-07-27 07:45:53 +00:00
Eduardo Quiros a2ab5d2dce
Merge pull request #80 from Quantum-P3/qa
dep
2021-07-27 07:22:29 +00:00
Eduardo Quiros 01fe76671b
Merge pull request #79 from Quantum-P3/dev
QA
2021-07-27 07:16:26 +00:00
Eduardo Quiros ba02aac8e3
Merge pull request #78 from Quantum-P3/feature/US-12
arreglo de estilos en landing y encuestas
2021-07-27 07:15:05 +00:00
Paola 07920751ff arreglo de estilos en landing y encuestas 2021-07-27 01:08:10 -06:00
Mariela Bonilla eb31ed41dd add filtrar colaboracion por estado 2021-07-27 00:59:15 -06:00
Mariela Bonilla 3a8a06abec Merge branch 'feature/US-63' into feature/US-65 2021-07-27 00:34:18 -06:00
Mariela Bonilla 3ce87a9c4c add listar colaboraciones de un usuario 2021-07-27 00:09:01 -06:00
Mariela Bonilla ca63cdfe88 Merge branch 'dev' into feature/US-63 2021-07-26 23:27:10 -06:00
Eduardo Quiros 1ade085444
Merge pull request #77 from Quantum-P3/fix/edit-duplicate-survey
Add duplicate functionality in context menu
2021-07-26 22:59:53 +00:00
Pablo Bonilla 7f534ee129
Merge branch 'dev' into fix/edit-duplicate-survey 2021-07-26 15:01:36 -06:00
Pablo Bonilla 6e7264b813
Add duplicate survey 2021-07-26 14:40:21 -06:00
Pablo Bonilla 3695c037b2
Add title and subtitle for categories and users 2021-07-26 13:21:18 -06:00
Pablo Bonilla 72c07e2bbf
Add duplicate button and fix delete button in survey list 2021-07-26 02:37:14 -06:00
Pablo Bonilla 306a2a0aaf
Update preview survey button position 2021-07-26 02:24:42 -06:00
Eduardo Quiros 1d6abd148c
Merge pull request #76 from Quantum-P3/feature/US-12
Feature/us 12
2021-07-26 07:35:11 +00:00
Paola dbf3551101 merge 2021-07-26 01:07:03 -06:00
Paola 39b355425d arreglo presentacion tabla 2021-07-26 01:01:02 -06:00
Pablo Bonilla 2b1c62a013
Add edit survey functionality in context menu 2021-07-26 00:55:41 -06:00
Eduardo Quiros 6262989496
Merge pull request #75 from Quantum-P3/fix/sprint-3/US-23
arreglar servicio de encuestas
2021-07-26 06:30:28 +00:00
Eduardo Quiros d02a2fd267
Merge pull request #74 from Quantum-P3/fix/design-dialog-table 2021-07-26 06:21:28 +00:00
Eduardo Quiros 9bc100f8af
Merge pull request #70 from Quantum-P3/feature/US-29 2021-07-26 06:20:50 +00:00
Eduardo Quiros 3439dcd202
arreglar servicio 2021-07-26 00:19:50 -06:00
Paola 8e51f11198 areglo landing page 2021-07-26 00:16:05 -06:00
Paola e5b23ac988 arreglo de alerta en publish 2021-07-26 00:12:50 -06:00
Mariela Bonilla ad96c0ee3b fix event dataset 2021-07-26 00:12:07 -06:00
Mariela Bonilla d6e1d32287 fix conflicts 2021-07-26 00:00:03 -06:00