Commit Graph

467 Commits

Author SHA1 Message Date
Eduardo Quiros 4f43f4f4cc
arreglar test 2021-08-01 13:53:59 -06:00
Paola c5507dc2a7 arreglo merge conflict 2021-08-01 12:23:37 -06:00
Paola 9d310922e2 agregar boton y dialog de finalizar encuesta 2021-08-01 12:15:26 -06:00
Eduardo Quiros 1c2d8a3451
Merge pull request #100 from Quantum-P3/feature/US-44
add eliminar colaborador de encuesta
2021-08-01 08:05:17 +00:00
Mariela Bonilla a9f2e0b2a3 cambiar nombre id en html de eliminar colaborador dialog 2021-07-31 21:57:36 -06:00
Mariela Bonilla a4df983b4f cerrar el modal del editar justo despues de eliminar al colaboradora 2021-07-31 21:36:57 -06:00
Mariela Bonilla c89e3bf1f9 Merge branch 'dev' into feature/US-44 2021-07-31 21:20:03 -06:00
Eduardo Quiros ba7b12fbdc
Merge pull request #99 from Quantum-P3/feature/US-62
add Modificar permisos de un colaborador
2021-08-01 02:56:07 +00:00
Mariela Bonilla e5da2970f2 add eliminar colaborador de encuesta completo 2021-07-31 19:00:08 -06:00
Mariela Bonilla 0099b842c4 Merge branch 'feature/US-62' into feature/US-44 2021-07-31 01:29:39 -06:00
Mariela Bonilla 7cba3ac321 Merge branch 'dev' into feature/US-62 2021-07-31 01:26:37 -06:00
Mariela Bonilla 0d04c8d80c fix texto de boton de cancelar 2021-07-31 01:26:17 -06:00
Mariela Bonilla c3b03ee372 fix update rol de colaboradores 2021-07-31 01:25:31 -06:00
Eduardo Quiros 4a20bebc66
Merge pull request #98 from Quantum-P3/feature/US-25
Feature/us 25
2021-07-31 05:09:35 +00:00
Paola cf847e55f0 agregar carpeta compartir 2021-07-30 23:02:54 -06:00
Paola 6d096ebfa4 arreglo filter 2021-07-30 23:00:12 -06:00
Paola 81757a0f11 Merge branch 'dev' into feature/US-25 2021-07-30 22:08:35 -06:00
Paola 8b8c5af512 arreglo filter 2021-07-30 22:07:23 -06:00
Eduardo Quiros 7fab6ed892
Merge pull request #97 from Quantum-P3/feature/US-42
Add modificar pregunta
2021-07-30 16:54:03 +00:00
Pablo Bonilla fb1a399694
Add edit question name 2021-07-30 01:34:25 -06:00
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