 Juan Ferrer
|
1565bc3a92
|
Docker compose fixes
gitea/salix/test There was a failure building this commit
Details
|
2019-12-23 12:06:05 +01:00 |
|
Juan Ferrer
|
3b4b0be167
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test There was a failure building this commit
Details
|
2019-12-23 11:10:55 +01:00 |
|
Juan Ferrer
|
55393eef33
|
Using docker configs
|
2019-12-23 11:10:45 +01:00 |
 Joan Sanchez
|
3d4fc9c18e
|
#1963 Entry & zone style changes
gitea/salix/master This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-12-23 08:05:58 +01:00 |
|
Juan Ferrer
|
c8e4615433
|
Merge branch 'test'
gitea/salix/master This commit looks good
Details
|
2019-12-22 15:12:57 +01:00 |
|
Joan Sanchez
|
ec1750476e
|
Fixed tags
gitea/salix/master This commit looks good
Details
|
2019-12-20 12:56:56 +01:00 |
|
Juan Ferrer
|
fce22f2e30
|
Jenkinsfile fixes
gitea/salix/test This commit looks good
Details
|
2019-12-19 16:23:59 +01:00 |
|
Juan Ferrer
|
00b103b389
|
Jenkinsfile fixes
gitea/salix/test There was a failure building this commit
Details
|
2019-12-19 16:16:54 +01:00 |
|
Juan Ferrer
|
5db65e188a
|
Jenkinsfile fixes
gitea/salix/test This commit looks good
Details
|
2019-12-19 16:11:56 +01:00 |
|
Juan Ferrer
|
1407b7b76f
|
Nginx config fixes
gitea/salix/test This commit looks good
Details
|
2019-12-19 15:45:19 +01:00 |
|
Juan Ferrer
|
592b672493
|
Compose now configuration is read from shared storage
gitea/salix/test This commit looks good
Details
|
2019-12-19 14:53:17 +01:00 |
|
Juan Ferrer
|
441f76a1c1
|
Jenkinsfile fixes
gitea/salix/test This commit looks good
Details
|
2019-12-19 14:38:39 +01:00 |
|
Juan Ferrer
|
1fb32e8ac5
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test There was a failure building this commit
Details
|
2019-12-19 14:31:12 +01:00 |
|
Juan Ferrer
|
109361a762
|
Jenkinsfile fixes
|
2019-12-19 14:31:02 +01:00 |
|
Juan Ferrer
|
325d0aa08e
|
Jenkinsfile fixes
gitea/salix/test There was a failure building this commit
Details
|
2019-12-19 14:29:17 +01:00 |
|
Joan Sanchez
|
c4d25bb1ce
|
Merge branch 'master' into test
gitea/salix/test There was a failure building this commit
Details
|
2019-12-19 14:29:16 +01:00 |
|
Juan Ferrer
|
4f3e3b41fa
|
Jenkinsfile fixes
gitea/salix/test There was a failure building this commit
Details
|
2019-12-19 14:28:06 +01:00 |
|
Juan Ferrer
|
d5a9a62f73
|
Deploy with docker swarm
gitea/salix/test There was a failure building this commit
Details
|
2019-12-19 14:27:29 +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 |