Commit Graph

502 Commits

Author SHA1 Message Date
Pablo Bonilla 55c58358ff
Merge branch 'dev' into fix/templates-register 2021-08-01 20:36:01 -06:00
Pablo Bonilla 7cf2ac0e3e
Fix survey template register validations 2021-08-01 20:17:50 -06:00
Eduardo Quiros dced20025b
Merge pull request #107 from Quantum-P3/feature/US-43
add agregar colaboradores a encuestas
2021-08-02 01:15:30 +00:00
Mariela Bonilla 24cb50d483 eliminar opcion vacia de seleccionar rol 2021-08-01 19:09:47 -06:00
Mariela Bonilla af8394b222 validaciones y fix mensajes de correos 2021-08-01 19:05:42 -06:00
Mariela Bonilla 7545affd77 Merge branch 'dev' into feature/US-43 2021-08-01 18:14:09 -06:00
Mariela Bonilla 391c4fcb29 add agregar colaborador completo 2021-08-01 18:13:17 -06:00
Eduardo Quiros 91e5bcb96f
Merge pull request #106 from Quantum-P3/feature/US-30
Add publicar plantilla en tienda
2021-08-01 22:32:04 +00:00
Pablo Bonilla f8c15583ea
Merge branch 'dev' into feature/US-30 2021-08-01 16:23:18 -06:00
Eduardo Quiros 3e2b7fe2d6
Merge pull request #105 from Quantum-P3/feature/US-65
add filtrar por rol y estado
2021-08-01 22:20:37 +00:00
Pablo Bonilla f7eaccfca9
Merge branch 'dev' into feature/US-30 2021-08-01 16:20:28 -06:00
Pablo Bonilla 085d5a16a6
Add publish and delete survey template to/from the store 2021-08-01 16:18:53 -06:00
Mariela Bonilla b649ac4d4e Merge branch 'feature/US-65' into feature/US-43 2021-08-01 16:17:12 -06:00
Mariela Bonilla b72b286939 Merge branch 'feature/US-63' into feature/US-65 2021-08-01 16:05:45 -06:00
Mariela Bonilla e1d11a5bea add filtro por estado 2021-08-01 16:04:33 -06:00
Mariela Bonilla daa7f28d1a Merge branch 'dev' into feature/US-63 2021-08-01 15:32:22 -06:00
Eduardo Quiros 723bb6d2dc
Merge pull request #101 from Quantum-P3/feature/US-58
Feature/us 58
2021-08-01 21:29:44 +00:00
Mariela Bonilla 4e661cb10f Merge branch 'dev' into feature/US-63 2021-08-01 15:27:51 -06:00
Mariela Bonilla d038ebb819 add agregar colaborador 2021-08-01 15:25:27 -06:00
Eduardo Quiros b45524111e
Merge pull request #102 from Quantum-P3/feature/US-33
Add crear plantilla
2021-08-01 19:55:15 +00:00
Eduardo Quiros 4f43f4f4cc
arreglar test 2021-08-01 13:53:59 -06:00
Pablo Bonilla 0943a984ca
Merge branch 'dev' into feature/US-33 2021-08-01 13:14:40 -06:00
Paola c5507dc2a7 arreglo merge conflict 2021-08-01 12:23:37 -06:00
Mariela Bonilla b068359da6 add modal add colaborador 2021-08-01 12:18:00 -06:00
Paola 9d310922e2 agregar boton y dialog de finalizar encuesta 2021-08-01 12:15:26 -06:00
Mariela Bonilla 184dc96556 Merge branch 'dev' into feature/US-43 2021-08-01 03:05:56 -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 884a06f6dd change test 2021-08-01 01:29:53 -06:00
Pablo Bonilla f8ab8ac0dd
Merge branch 'dev' into feature/US-33 2021-08-01 01:04:39 -06:00
Pablo Bonilla 089174935d
Remove tests 2021-08-01 01:04:15 -06:00
Pablo Bonilla 47f940dcaa
Add survey template question and options registration 2021-08-01 00:54:44 -06:00
Mariela Bonilla 9d59fc2346 add validaciones de permisos en las encuestas por rol de colaborador 2021-08-01 00:36:35 -06:00
Pablo Bonilla eb74718af3
Update survey template list 2021-07-31 22:52:17 -06:00
Mariela Bonilla a9f2e0b2a3 cambiar nombre id en html de eliminar colaborador dialog 2021-07-31 21:57:36 -06:00
Pablo Bonilla bc8ef1941b
Add register survey template 2021-07-31 21:53:35 -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
Mariela Bonilla 2b51cacb7a Merge branch 'dev' into feature/US-63 2021-07-31 21:14:50 -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