Commit Graph

601 Commits

Author SHA1 Message Date
Mariela Bonilla 089f508fa7 Merge branch 'dev' into feature/US-62 2021-07-30 00:29:58 -06:00
Mariela Bonilla 8efb844612 add modificar rol de colaborador 2021-07-30 00:21:31 -06:00
Eduardo Quiros 2a77c017fa
Merge pull request #95 from Quantum-P3/feature/US-31
Feature/us-31: listar plantillas para administrador
2021-07-30 06:08:09 +00:00
Eduardo Quiros fc06774ae6
Merge pull request #96 from Quantum-P3/feature/US-60
Add modificar encuestas
2021-07-30 06:05:25 +00:00
Eduardo Quiros c858e73a29
Arreglar traducción de listado de plantillas 2021-07-29 22:55:16 -06:00
Eduardo Quiros 0a774fc110
remover columnas innecesarias 2021-07-29 22:50:38 -06:00
Eduardo Quiros 14ec57ab12
corregir uso de inglés en html 2021-07-29 22:50:21 -06:00
Eduardo Quiros e1cf432fc3
agregar estilos de botones 2021-07-29 22:49:50 -06:00
Eduardo Quiros 4b3f1368a7
rehabilitar el link de plantillas en el sidebar 2021-07-29 22:35:19 -06:00
Eduardo Quiros d93378c56f
declarar no uso de index en trackid 2021-07-29 22:33:00 -06:00
Pablo Bonilla e615cb9d7c
Merge branch 'dev' into feature/US-60 2021-07-29 22:31:22 -06:00
Eduardo Quiros 21caf4c5a8
Merge pull request #94 from Quantum-P3/feature/US-61
add mostrar colaboradores de una encuesta
2021-07-30 04:18:22 +00:00
Pablo Bonilla 6f0ea69a27
Add edit survey from survey list 2021-07-29 22:15:36 -06:00
Mariela Bonilla f0f0fb4aa7 Merge branch 'feature/US-61' into feature/US-62 2021-07-29 21:37:56 -06:00
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