Commit Graph

641 Commits

Author SHA1 Message Date
Eduardo Quiros e8e0e30327
Merge branch 'dev' of github.com:Quantum-P3/datasurvey into feature/US-49 2021-08-11 12:26:19 -06:00
Eduardo Quiros a9bee3af53
Merge pull request #110 from Quantum-P3/feature/US-28
Feature/us 28
2021-08-11 18:12:43 +00:00
Eduardo Quiros 84fb6cd353
Merge pull request #122 from Quantum-P3/feature/US-32
Feature/us 32
2021-08-11 18:10:45 +00:00
Paola bf83738055 conflict fix 2021-08-11 12:03:27 -06:00
Paola c7500a35f8 Merge branch 'dev' into feature/US-32 2021-08-11 11:38:55 -06:00
Paola 5f958cf333 arreglo archivos test 2021-08-11 11:36:28 -06:00
Mariela Bonilla fec15cee41 fix tests 2021-08-11 11:29:59 -06:00
Mariela Bonilla ed3925bc3a Merge branch 'dev' into feature/US-49 2021-08-11 11:28:02 -06:00
Eduardo Quiros e3601e7bc8
Merge pull request #120 from Quantum-P3/fix/toggle-category-status
Fix bug when toggling a category
2021-08-11 15:04:31 +00:00
Mariela Bonilla 0c00fa0396 add visualizar reportes administrador 2021-08-11 05:15:08 -06:00
Paola 580eded1ce Merge branch 'dev' into feature/US-32 2021-08-11 01:32:17 -06:00
Paola cd2ee8803b modificacion PayPal y agregacion de correo 2021-08-11 01:30:33 -06:00
Pablo Bonilla f2aeb4ceff
Merge branch 'dev' into fix/toggle-category-status 2021-08-10 22:29:42 -06:00
Pablo Bonilla 7cefd91cf6
Fix bug where changing category state triggers publish survey email 2021-08-10 22:24:31 -06:00
Eduardo Quiros 3705d130e9
Merge pull request #119 from Quantum-P3/fix/table-design
Add datasurvey table design
2021-08-11 04:08:22 +00:00
Pablo Bonilla b30d29c913
Update table designs for user 2021-08-10 21:55:41 -06:00
Pablo Bonilla 94221cb193
Add datasurvey table design 2021-08-10 21:53:09 -06:00
Pablo Bonilla e5c679570a
Add PDF title 2021-08-10 18:22:01 -06:00
Pablo Bonilla 6267ff5071
Add jsPDF export as PDF 2021-08-10 18:07:25 -06:00
Pablo Bonilla edda17d1a5
Add XLSX export as Excel 2021-08-10 16:18:54 -06:00
Eduardo Quiros 3c58e9f4c9
Merge pull request #118 from Quantum-P3/feature/dashboard
add page dashboard
2021-08-10 03:01:37 +00:00
Mariela Bonilla 8812eea915 fix links dashboards 2021-08-09 19:26:35 -06:00
Mariela Bonilla 5542c12c82 add page dashboard 2021-08-09 19:07:19 -06:00
Paola 3ef698c0d3 modificaciones de PayPal 2021-08-09 18:58:06 -06:00
Eduardo Quiros 4407fa0de8
Merge pull request #117 from Quantum-P3/feature/US-37
filtrado de plantillas como usuario
2021-08-09 06:05:53 +00:00
Eduardo Quiros d784906395
agregar filtrado por nombre de plantilla 2021-08-08 23:54:23 -06:00
Eduardo Quiros 5cc8548e51
prefix unused declarations with '_' 2021-08-08 23:39:07 -06:00
Eduardo Quiros d82a53548b
add searchString 2021-08-08 23:38:33 -06:00
Eduardo Quiros 999335af87
remove unused imports 2021-08-08 23:37:08 -06:00
Eduardo Quiros 842fd46ff8
Merge pull request #116 from Quantum-P3/feature/US-40
Add crear encuesta a partir de una plantilla
2021-08-09 03:24:03 +00:00
Eduardo Quiros 3ee63630d4
Merge pull request #115 from Quantum-P3/feature/US-66
add filtrar plantillas para administrador
2021-08-09 03:23:08 +00:00
Pablo Bonilla 170742324b
Add survey template view button and remove lift effect on preview card 2021-08-08 14:55:48 -06:00
Pablo Bonilla be7d6041dc
Fix end survey dialog and button position 2021-08-08 14:44:03 -06:00
Pablo Bonilla 80b55773d9
Add create survey from template 2021-08-08 14:29:02 -06:00
Pablo Bonilla ee2853820a
Add surveys, collaborations, and user templates list placeholder 2021-08-08 13:51:45 -06:00
Pablo Bonilla 6015f41683
Merge branch 'dev' into feature/US-40 2021-08-08 13:01:54 -06:00
Mariela Bonilla eee67f3a92 Merge branch 'dev' into feature/US-66 2021-08-08 01:53:57 -06:00
Eduardo Quiros 3dbe2c5329
Merge pull request #114 from Quantum-P3/feature/US-35
add desactivar/activar plantilla
2021-08-08 07:52:17 +00:00
Mariela Bonilla 9db2bce4f8 Merge branch 'dev' into feature/US-66 2021-08-08 01:36:49 -06:00
Mariela Bonilla d9db75ec87 fix tests 2021-08-08 01:35:57 -06:00
Paola e2fbc4a607 tienda de plantillas y boton paypal 2021-08-08 00:51:16 -06:00
Mariela Bonilla 09d86ebaef Merge branch 'dev' into feature/US-35 2021-08-08 00:44:38 -06:00
Eduardo Quiros 3e0be442c8
Merge pull request #103 from Quantum-P3/feature/US-45
Feature/us 45
2021-08-08 06:43:11 +00:00
Eduardo Quiros 956f7e58fc
Merge pull request #113 from Quantum-P3/feature/US-34
add eliminar plantilla
2021-08-08 06:42:22 +00:00
Mariela Bonilla 6ca5860779 fix test 2021-08-08 00:05:39 -06:00
Mariela Bonilla e0076dfd25 Merge branch 'dev' into feature/US-34 2021-08-07 23:28:35 -06:00
Eduardo Quiros f1f2542963
Merge pull request #112 from Quantum-P3/feature/US-39
add visualizar plantillas compradas
2021-08-08 03:35:57 +00:00
Mariela Bonilla 75b7b2c180 add visualizar plantillas compradas 2021-08-07 03:30:50 -06:00
Eduardo Quiros 1c9f45db89
registrar respuestas 2021-08-07 00:13:48 -06:00
Eduardo Quiros aa5fddb08e
ampliar tamaño de textarea y agregar id 2021-08-06 23:03:59 -06:00