Commit Graph

6426 Commits

Author SHA1 Message Date
Joan Sanchez ab66557cd0 Merge branch '1707route.ticket' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-13 09:46:13 +00:00
Bernat Exposito Domenech ff117c1811 merge conflicts structure.sql
gitea/salix/1707route.ticket This commit looks good Details
2019-12-13 09:06:39 +01:00
Bernat Exposito c65364cda4 Merge branch '1907manaSpellers' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-13 07:57:36 +00:00
Bernat Exposito Domenech dd86961542 update structure
gitea/salix/1907manaSpellers This commit looks good Details
2019-12-13 08:46:40 +01:00
Joan Sanchez 2325127390 pull from dev
gitea/salix/1921-claim_detail_discount This commit looks good Details
2019-12-13 08:40:59 +01:00
Juan Ferrer 008669b8a1 Merge branch '1912' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-13 07:28:39 +00:00
Joan Sanchez 7bbb9fa321 Pull from dev
gitea/salix/1921-claim_detail_discount This commit looks good Details
2019-12-13 08:26:27 +01:00
Javi Gallego 44304e993a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1912
gitea/salix/1912 This commit looks good Details
2019-12-13 08:19:22 +01:00
Joan Sanchez 676b5198a8 changed discount popover width + refresh discount
gitea/salix/1921-claim_detail_discount This commit looks good Details
2019-12-13 08:01:13 +01:00
Bernat Exposito 6d1bd7575d Merge branch '1925excludeTables' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-13 06:17:03 +00:00
Carlos Jimenez Ruiz e8bf326b53 Merge branch 'pull-request-check-test' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-12 15:27:11 +00:00
Juan Ferrer a47fa7a413 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into pull-request-check-test
gitea/salix/pull-request-check-test This commit looks good Details
2019-12-12 15:15:28 +01:00
Juan Ferrer 7e5f6e6acf Pull request check test
gitea/salix/pull-request-check-test This commit has test failures Details
2019-12-12 15:02:58 +01:00
Juan Ferrer d61b08ed10 Merge branch '1922-mysql8' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-12 13:49:05 +00:00
Bernat Exposito Domenech 0ef036caf9 traduccion
gitea/salix/1925excludeTables This commit looks good Details
2019-12-12 14:31:22 +01:00
Bernat Exposito Domenech 1194f735a6 traduccion 2019-12-12 14:31:08 +01:00
Bernat Exposito Domenech e8c216799c update estructure
gitea/salix/1925excludeTables This commit looks good Details
2019-12-12 14:28:58 +01:00
Javi Gallego ec081e6a3a campo claimDestinationFk ya no esta como required
gitea/salix/1912 This commit looks good Details
2019-12-12 13:53:54 +01:00
Bernat Exposito Domenech a87ce44f08 test front worker.phone
gitea/salix/1858testworkerPhone This commit looks good Details
2019-12-12 12:23:31 +01:00
Carlos Jimenez Ruiz 8a2eda7c08 Merge branch '1923-ticket-summary-discount' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-12 10:06:47 +00:00
Carlos Jimenez Ruiz 34a70fa1db Merge branch '1920-remove-sms-password' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-12 10:04:37 +00:00
Joan Sanchez 62aae9ce14 removed password from fixtures
gitea/salix/1920-remove-sms-password This commit looks good Details
2019-12-12 09:46:29 +01:00
Bernat Exposito Domenech e573a2cff0 fix error
gitea/salix/1707route.ticket There was a failure building this commit Details
2019-12-12 09:13:24 +01:00
Bernat Exposito Domenech 126a02c1b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1707route.ticket 2019-12-12 09:11:45 +01:00
Carlos Jimenez Ruiz 4d493c3572 Merge branch 'E2E-fix-for-windows' of verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-12-12 07:25:22 +00:00
Joan Sanchez af47ab6cac fixed styles & discounts
gitea/salix/1923-ticket-summary-discount There was a failure building this commit Details
2019-12-12 08:22:04 +01:00
Juan Ferrer 3532c52e07 Back docker healthcheck fix
gitea/salix/master This commit looks good Details
2019-12-11 17:04:41 +01:00
Juan Ferrer 9c4f776281 Disabled back restart, added back healthcheck
gitea/salix/master This commit looks good Details
2019-12-11 16:51:45 +01:00
Juan Ferrer 1b32c13c7f Disabled back restart, added back healthcheck
gitea/salix/test This commit looks good Details
2019-12-11 16:30:45 +01:00
Juan Ferrer 34bbf16e14 Focus removed from test
gitea/salix/1922-mysql8 This commit looks good Details
2019-12-11 15:01:27 +01:00
Juan Ferrer 3428dfa6e0 Migration complete & test 2019-12-11 15:01:01 +01:00
Carlos Jimenez Ruiz 304355fb9d Merge branch '1900travelCreate' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-10 11:51:40 +00:00
Bernat Exposito Domenech d0a2f4627b 1707 route.ticket sistema tablas que soporte dirección salida para warehouses
gitea/salix/1707route.ticket This commit looks good Details
2019-12-10 12:42:14 +01:00
Bernat Exposito Domenech 17acfc2631 update translations
gitea/salix/1900travelCreate This commit looks good Details
2019-12-10 08:18:53 +01:00
Bernat Exposito Domenech 2cc9c5e951 create section travel create
gitea/salix/1900travelCreate This commit looks good Details
2019-12-09 12:15:19 +01:00
Juan Ferrer 7fbefce3a6 Back restart rescheduled
gitea/salix/test This commit looks good Details
2019-12-09 11:36:20 +01:00
Juan Ferrer ad7636b879 Back restart at night
gitea/salix/master This commit looks good Details
2019-12-09 09:33:59 +01:00
Juan Ferrer 982832d29b module removed from api path
gitea/salix/master This commit looks good Details
2019-12-08 14:42:59 +01:00
Juan Ferrer 34ff3048c9 Back port range fixes
gitea/salix/master This commit looks good Details
2019-12-08 14:18:52 +01:00
Juan Ferrer 1f50030301 Back port range fixes
gitea/salix/test This commit looks good Details
2019-12-08 14:16:01 +01:00
Juan Ferrer 1ac422a963 Back autoheal & health-check
gitea/salix/master This commit looks good Details
2019-12-08 14:11:02 +01:00
Juan Ferrer b10fb4433b Back restarted every 30 minuts
gitea/salix/test This commit looks good Details
2019-12-08 14:02:05 +01:00
Juan Ferrer 68417e00ac Autorestart checked & enabled every 15 minuts 2019-12-08 13:54:20 +01:00
Juan Ferrer fb8bb0c8bc process.yml fixes
gitea/salix/test This commit looks good Details
2019-12-08 13:52:58 +01:00
Juan Ferrer 72bca19f49 Autorestart
gitea/salix/test This commit looks good Details
2019-12-08 13:48:57 +01:00
Juan Ferrer 6f07f7f990 Back autoheal & health-check
gitea/salix/test This commit looks good Details
2019-12-08 12:31:32 +01:00
Juan Ferrer 966c02a0e1 JS doc fixes
gitea/salix/dev This commit has test failures Details
2019-12-08 11:45:53 +01:00
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