Commit Graph

6309 Commits

Author SHA1 Message Date
Joan Sanchez ec1750476e Fixed tags
gitea/salix/master This commit looks good Details
2019-12-20 12:56:56 +01:00
Joan Sanchez aa809eea8a trigger build
gitea/salix/master This commit looks good Details
2019-12-19 14:21:18 +01:00
Joan Sanchez 8a54da6fd3 fixed dms links 2019-12-19 14:13:24 +01:00
Joan Sanchez 7fa22da619 Use country code as default language
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-12-19 12:42:50 +01:00
Juan Ferrer 9947021736 #1953 Temporal fix
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-12-19 12:17:53 +01:00
Joan Sanchez f42f46dc42 Merge branch '1913-stowaway_unboarding' of verdnatura/salix into master
gitea/salix/master This commit looks good Details
2019-12-17 12:53:06 +00:00
Joan Sanchez 9d487f3cee updated translation
gitea/salix/1913-stowaway_unboarding This commit looks good Details
2019-12-17 13:25:30 +01:00
Juan Ferrer 60d7e8844d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-12-17 13:19:09 +01:00
Juan Ferrer a39a35f1a1 1941-autocomplete 2019-12-17 13:18:58 +01:00
Joan Sanchez 7d47757c64 fixed claim responsibility
gitea/salix/master This commit looks good Details
2019-12-17 13:03:09 +01:00
Juan Ferrer 39a41f9a64 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/master This commit looks good Details
2019-12-17 12:23:46 +01:00
Juan Ferrer 4da83ef963 Hotfixes: vnTicketSale menu, vnItemDiary width 2019-12-17 12:23:31 +01:00
Joan Sanchez 8ddcd5a654 ACL fixes
gitea/salix/master This commit looks good Details
2019-12-17 12:18:17 +01:00
Juan Ferrer d1341c2758 Hotfixes
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-12-17 09:23:11 +01:00
Juan Ferrer 2860348ebf Merge branch 'master' into test
gitea/salix/master This commit looks good Details
2019-12-17 08:53:02 +01:00
Joan Sanchez ef95244d07 stowaway refactor
gitea/salix/1913-stowaway_unboarding This commit looks good Details
2019-12-17 08:38:36 +01:00
Joan Sanchez 7a2240b595 Merge branch 'test' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-16 07:28:22 +00:00
Bernat Exposito 605cfbf850 Merge branch '1931-delivery_note_translations' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-16 07:13:28 +00:00
Joan Sanchez 9f5ba0c48b Merge branch '1931-delivery_note_translations' of verdnatura/salix into test
gitea/salix/test This commit looks good Details
2019-12-16 07:12:15 +00:00
Joan Sanchez 10fcb10787 added translations & fixed null locale value
gitea/salix/1931-delivery_note_translations This commit looks good Details
2019-12-16 08:01:19 +01:00
Joan Sanchez 29f437d716 Merge branch 'dev' of verdnatura/salix into test
gitea/salix/test This commit looks good Details
2019-12-13 14:26:32 +00:00
Joan Sanchez ba51b49973 Merge branch '0000-mergeWithTest' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-13 12:25:45 +00:00
Juan Ferrer 3b17f51adc Merge branch 'dev' into 0000-mergeWithTest
gitea/salix/0000-mergeWithTest This commit looks good Details
2019-12-13 13:06:25 +01:00
Juan Ferrer 6b7fb93e44 Merge branch 'test' into 0000-mergeWithTest 2019-12-13 12:50:26 +01:00
Joan Sanchez fb30c9b6a3 Merge branch '1919-ticket_service_type' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-13 11:49:52 +00:00
Joan Sanchez 4a69a7f9b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1919-ticket_service_type
gitea/salix/1919-ticket_service_type This commit looks good Details
2019-12-13 12:31:51 +01:00
Joan Sanchez da361a8ffb Merge branch '1921-claim_detail_discount' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-13 11:19:46 +00:00
Joan Sanchez ec9478c86c e2e updated
gitea/salix/1919-ticket_service_type This commit looks good Details
2019-12-13 12:18:20 +01:00
Joan Sanchez 8808e49a10 updated unit test
gitea/salix/1919-ticket_service_type This commit looks good Details
2019-12-13 12:07:36 +01:00
Joan Sanchez 4e39a7823b removed focus
gitea/salix/1919-ticket_service_type There was a failure building this commit Details
2019-12-13 12:01:15 +01:00
Joan Sanchez 780f1e4773 renamed expence to expense and added field
gitea/salix/1919-ticket_service_type There was a failure building this commit Details
2019-12-13 11:59:25 +01:00
Joan Sanchez a937257e79 Merge branch '1858testworkerPhone' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-13 10:29:33 +00:00
Bernat Exposito Domenech 2e68ad0d01 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1858testworkerPhone
gitea/salix/1858testworkerPhone This commit looks good Details
2019-12-13 10:54:52 +01:00
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