Bernat
|
8743f74c82
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-25 12:14:32 +01:00 |
|
Bernat
|
37e7ec5de1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-25 12:13:42 +01:00 |
Carlos Jimenez Ruiz
|
6d70a45f41
|
added a comma becouse becouse
gitea/salix/dev This commit looks good
Details
|
2019-02-25 12:08:16 +01:00 |
|
Bernat
|
7ea20833e2
|
testing gitea
|
2019-02-25 12:03:47 +01:00 |
|
Carlos Jimenez Ruiz
|
11a2be6ac4
|
#882 e2e claim.action
gitea/salix/dev This commit looks good
Details
|
2019-02-25 11:47:28 +01:00 |
|
Carlos Jimenez Ruiz
|
4709a55b8f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-25 11:38:18 +01:00 |
 Joan Sanchez
|
559a9fe96f
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-25 10:04:53 +01:00 |
|
Joan Sanchez
|
5ec352b71a
|
fixed vn-mysql time offset
gitea/salix/test This commit looks good
Details
|
2019-02-25 10:04:11 +01:00 |
|
Joan Sanchez
|
ac1e619b06
|
fixed zone bugs
|
2019-02-25 10:03:50 +01:00 |
|
Carlos Jimenez Ruiz
|
f6a5fb106f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-25 09:35:08 +01:00 |
|
Carlos Jimenez Ruiz
|
69c5c8f1cd
|
#485
|
2019-02-25 09:28:25 +01:00 |
|
Bernat
|
6e23b5bcc0
|
update structure db cau 9939
gitea/salix/dev This commit looks good
Details
|
2019-02-25 08:49:08 +01:00 |
|
Bernat
|
45527a43da
|
cau 9939 refactor db/changes files and update structure db
|
2019-02-25 08:25:53 +01:00 |
|
Bernat
|
04280c5b5a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-25 08:10:38 +01:00 |
 Juan Ferrer
|
c3f20dba3c
|
Small fix
gitea/salix/test This commit looks good
Details
gitea/salix/master This commit looks good
Details
|
2019-02-22 17:23:03 +01:00 |
|
Juan Ferrer
|
ba62f545f7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-22 16:17:08 +01:00 |
|
Juan Ferrer
|
26419e75c9
|
Style fixes
gitea/salix/test This commit looks good
Details
|
2019-02-22 16:15:54 +01:00 |
|
Juan Ferrer
|
961eb6edaf
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good
Details
|
2019-02-22 14:38:45 +01:00 |
|
Juan Ferrer
|
9fc6a2c4c2
|
Style fixes
|
2019-02-22 14:34:11 +01:00 |
Gerard
|
ea9d194368
|
traduction added
gitea/salix/test This commit looks good
Details
|
2019-02-22 13:18:53 +01:00 |
|
Gerard
|
84b36b601c
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-22 12:43:41 +01:00 |
|
Gerard
|
9370142731
|
styles fixed
gitea/salix/test This commit looks good
Details
|
2019-02-22 12:43:08 +01:00 |
|
Bernat
|
b9dd605c77
|
udate structure db
|
2019-02-22 12:38:27 +01:00 |
|
Gerard
|
6364239d8a
|
#1152 updated td-editable
gitea/salix/dev This commit looks good
Details
|
2019-02-22 12:27:56 +01:00 |
|
Gerard
|
35d4c99e53
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-22 11:30:50 +01:00 |
|
Gerard
|
6c46400d3d
|
checkbox styles fixed
gitea/salix/test This commit looks good
Details
|
2019-02-22 08:52:30 +01:00 |
|
Gerard
|
86b3407e35
|
item barcode to item created
gitea/salix/test This commit looks good
Details
|
2019-02-22 08:32:18 +01:00 |
|
Gerard
|
59e28e4ea4
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-22 08:18:03 +01:00 |
|
Gerard
|
f1afe16c9e
|
icon not showing correctly fixed
gitea/salix/master This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-02-21 14:24:27 +01:00 |
|
Gerard
|
c590dc6270
|
traduction added
gitea/salix/master This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-02-21 14:08:32 +01:00 |
|
Gerard
|
d722df86cf
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-21 13:50:41 +01:00 |
|
Gerard
|
1324d53e1b
|
claim action now shows ticket
gitea/salix/test This commit looks good
Details
gitea/salix/master This commit looks good
Details
|
2019-02-21 13:48:34 +01:00 |
|
Joan Sanchez
|
8a192b4f57
|
updated fixture price for item 4 on ticket 11
gitea/salix/dev This commit looks good
Details
|
2019-02-21 13:09:14 +01:00 |
|
Gerard
|
1e199e9d5a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
gitea/salix/test This commit looks good
Details
|
2019-02-21 12:58:05 +01:00 |
|
Gerard
|
6fb936a08a
|
ticket log disabled temporally
|
2019-02-21 12:57:19 +01:00 |
|
Carlos Jimenez Ruiz
|
413d2f2855
|
merge
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 11:53:19 +01:00 |
|
Carlos Jimenez Ruiz
|
050c5c1126
|
#1131 Refactor vn-icon a vn-icon-button en las templates.
|
2019-02-21 11:40:27 +01:00 |
|
Gerard
|
506c857b70
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-21 10:17:54 +01:00 |
|
Gerard
|
03e168739b
|
updated icons
gitea/salix/test This commit looks good
Details
|
2019-02-21 10:17:13 +01:00 |
|
Juan Ferrer
|
02569aeea4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 10:10:48 +01:00 |
|
Juan Ferrer
|
e42da544cd
|
Styles fixed
|
2019-02-21 10:10:38 +01:00 |
|
Gerard
|
ab6606a624
|
Merge branch 'test' into dev
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 10:07:27 +01:00 |
|
Gerard
|
8d6fdc4b2f
|
added envialia and solved problems with worker popover
gitea/salix/test This commit looks good
Details
|
2019-02-21 10:06:38 +01:00 |
|
Joan Sanchez
|
c9746521dc
|
removed unused getSubTotal() method
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 08:44:03 +01:00 |
|
Joan Sanchez
|
06be535115
|
ticket subtotal should check service prices #1151
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 08:43:04 +01:00 |
|
Carlos Jimenez Ruiz
|
0f496b9500
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-21 07:49:30 +01:00 |
|
Gerard
|
42cc2bde0d
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-21 07:48:31 +01:00 |
|
Gerard
|
444d531162
|
summary action now shows ticket id
gitea/salix/test This commit looks good
Details
|
2019-02-21 07:46:27 +01:00 |
|
Carlos Jimenez Ruiz
|
1ac820478e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-21 07:40:38 +01:00 |
|
Carlos Jimenez Ruiz
|
c3679b5642
|
#1077 e2e específico para login
|
2019-02-21 07:40:22 +01:00 |