Commit Graph

6379 Commits

Author SHA1 Message Date
Bernat Exposito a6c5563513 Merge branch '1834createTravelModels' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-05 13:29:27 +00:00
Bernat Exposito Domenech f6eabc81da add models and update structure db
gitea/salix/1834createTravelModels This commit looks good Details
2019-12-05 14:20:11 +01:00
Javi Gallego 9f047dc615 Merge branch '1904/upgradeStructureDb' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-04 10:53:14 +00:00
Bernat da2503d4b8 fix test
gitea/salix/1904%2FupgradeStructureDb This commit looks good Details
2019-12-04 11:18:26 +01:00
Bernat 261b9686a0 update procedures db 2019-12-04 11:10:24 +01:00
Bernat f38210ddd2 udate structure db 2019-12-04 11:09:36 +01:00
Javi Gallego b8a0e69535 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into E2E-fix-for-windows
gitea/salix/E2E-fix-for-windows This commit looks good Details
2019-11-28 12:55:41 +01:00
Javi Gallego 3c36526f12 E2E fix for windows plus refactors 2019-11-28 12:54:34 +01:00
Carlos Jimenez Ruiz 3163dfa19e Merge branch '1772-campaign_metrics' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-28 07:42:16 +00:00
Carlos Jimenez Ruiz 909fef5e86 #1903 informe consumo campaña
gitea/salix/1772-campaign_metrics This commit looks good Details
2019-11-28 08:30:36 +01:00
Carlos Jimenez Ruiz f4e0d04b64 #1903 informe consumo campaña
gitea/salix/1772-campaign_metrics This commit looks good Details
2019-11-27 16:16:22 +01:00
Carlos Jimenez Ruiz ee92ec42f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1772-campaign_metrics 2019-11-27 16:02:14 +01:00
Carlos Jimenez Ruiz 8624a3db68 #1903 informe consumo campaña removed comented code 2019-11-27 16:02:07 +01:00
Carlos Jimenez Ruiz 0c0ae14263 #1903 informe consumo campaña 2019-11-27 16:00:42 +01:00
Carlos Jimenez Ruiz 84d32a2a70 Merge branch '1904delete_vn2008_references' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-27 12:42:47 +00:00
Bernat 8f4e44aa37 update procedures db
gitea/salix/1904delete_vn2008_references This commit looks good Details
2019-11-27 13:37:36 +01:00
Bernat dcdd4473b1 fix structure db
gitea/salix/1904delete_vn2008_references This commit looks good Details
2019-11-27 11:57:09 +01:00
Bernat 89e127f0ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1904delete_vn2008_references
gitea/salix/1904delete_vn2008_references This commit looks good Details
2019-11-26 14:26:50 +01:00
Bernat 18b5342609 update fixtures and structure db 2019-11-26 14:15:43 +01:00
Carlos Jimenez Ruiz 74213ad880 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1772-campaign_metrics 2019-11-26 06:55:50 +01:00
Bernat Exposito a4a48e76a4 Merge branch '1762-worker_dms' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-25 08:33:04 +00:00
Joan Sanchez f9dba9489f updated tests
gitea/salix/1762-worker_dms This commit looks good Details
2019-11-25 09:17:24 +01:00
Carlos Jimenez Ruiz 58ee076524 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1772-campaign_metrics 2019-11-25 09:14:39 +01:00
Joan Sanchez 8fc76b49c9 summary unit tests #1905
gitea/salix/dev This commit looks good Details
2019-11-25 08:35:34 +01:00
Joan Sanchez 974bf67e8d removed focus
gitea/salix/dev This commit looks good Details
2019-11-25 07:46:00 +01:00
Carlos Jimenez Ruiz 474e42c9bd #1772 informe consumo campaña email template
gitea/salix/1772-campaign_metrics This commit looks good Details
2019-11-22 16:01:11 +01:00
Bernat 5040d1d4a8 #1711 Eliminar referencias al esquema vn2008
gitea/salix/dev This commit looks good Details
2019-11-22 14:34:28 +01:00
Joan Sanchez a077dd5165 test unitario
gitea/salix/1762-worker_dms There was a failure building this commit Details
2019-11-22 14:34:20 +01:00
Joan Sanchez 3c144ea0cd transaction changes
gitea/salix/1762-worker_dms There was a failure building this commit Details
2019-11-22 13:46:38 +01:00
Juan Ferrer f50f99b962 Minor bug & style fixes
gitea/salix/dev This commit looks good Details
2019-11-22 13:23:43 +01:00
Bernat Exposito 6a153bd69d Merge branch 'timeControl_calculate' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-22 09:55:31 +00:00
Joan Sanchez 5aae48c7dc added gestdoc
gitea/salix/1762-worker_dms There was a failure building this commit Details
2019-11-22 10:42:05 +01:00
Joan Sanchez 07af68b7c9 Merge branch '1711Eliminar_referencias_vn2008' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-22 08:07:49 +00:00
Bernat 1ce0c63bf2 1711Eliminar_referencias_vn2008
gitea/salix/1711Eliminar_referencias_vn2008 This commit looks good Details
2019-11-22 08:23:31 +01:00
Joan Sanchez a67f6ec1ae removed zeroFill
gitea/salix/dev This commit looks good Details
2019-11-22 07:41:06 +01:00
Carlos Jimenez Ruiz dca7dd5fc7 rejected last modifications
gitea/salix/timeControl_calculate This commit looks good Details
2019-11-21 14:51:11 +01:00
Carlos Jimenez Ruiz 33e9cf9816 Javi validation
gitea/salix/timeControl_calculate This commit looks good Details
2019-11-21 14:39:09 +01:00
Carlos Jimenez Ruiz a45ca84e7f workerTimeControlCalculate procedure refactor
gitea/salix/timeControl_calculate This commit looks good Details
2019-11-21 14:23:22 +01:00
Joan Sanchez 5dc569c12f updated selector
gitea/salix/dev This commit looks good Details
2019-11-21 14:18:07 +01:00
Bernat Exposito 9f345fe244 Merge branch '1875-send-sms-dialog' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-21 13:13:05 +00:00
Joan Sanchez 27cab0e722 added sms option to client descriptor
gitea/salix/1875-send-sms-dialog This commit looks good Details
2019-11-21 14:00:27 +01:00
Bernat 857fbe0299 fix e2e
gitea/salix/dev This commit looks good Details
2019-11-21 13:18:44 +01:00
Bernat 038ba3edb2 1711 update structure db 2019-11-21 13:18:30 +01:00
Joan Sanchez 1841848b06 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good Details
2019-11-21 13:03:15 +01:00
Joan Sanchez 423240ac7d open dialog 2019-11-21 13:02:46 +01:00
Carlos Jimenez Ruiz f4a62dfa86 Merge branch '1770-calculate_components' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-21 11:30:00 +00:00
Juan Ferrer f118f22a69 Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
2019-11-21 12:07:57 +01:00
Juan Ferrer 30ac174b1e SQL grouping quoted
gitea/salix/dev This commit looks good Details
2019-11-21 12:01:21 +01:00
Joan Sanchez fd72f206bc Recalculate ticket components #1770
gitea/salix/1770-calculate_components This commit looks good Details
2019-11-21 12:00:56 +01:00
Carlos Jimenez Ruiz 0733ef8949 Merge branch '1891-worker_time_control_tests' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
Joan: LGTM
2019-11-21 10:36:47 +00:00