 Juan Ferrer
|
424d9b706f
|
Jenkins fixes
|
2019-01-26 15:10:10 +01:00 |
|
Juan Ferrer
|
22571ed3f2
|
Jenkins test
|
2019-01-26 15:06:38 +01:00 |
|
Juan Ferrer
|
8b81e6cab9
|
Jenkins fixes
|
2019-01-26 15:01:06 +01:00 |
|
Juan Ferrer
|
50eb5e10e1
|
Jenkins fixes
|
2019-01-26 14:57:09 +01:00 |
|
Juan Ferrer
|
1a991c92b5
|
Jenkins testing fixes
|
2019-01-26 14:53:32 +01:00 |
|
Juan Ferrer
|
21e3fe9fc9
|
Jenkins testing fixes
|
2019-01-26 14:51:36 +01:00 |
|
Juan Ferrer
|
4ee7ed099e
|
Jenkins CI testing
|
2019-01-26 14:48:55 +01:00 |
|
Juan Ferrer
|
f47ce96ce8
|
Nginx conf fixed
|
2019-01-26 14:22:59 +01:00 |
|
Juan Ferrer
|
f584bd6953
|
Nginx fixes
|
2019-01-26 13:38:28 +01:00 |
|
Juan Ferrer
|
4aa3a839b7
|
Debug & watch enabled y default in gulp back, webpack HMR, e2e fixes
|
2019-01-26 13:12:18 +01:00 |
Carlos Jimenez Ruiz
|
20bea9679c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-26 13:04:20 +01:00 |
 Javi Gallego
|
97badcdb5e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-26 12:18:01 +01:00 |
|
Javi Gallego
|
35375c856a
|
traduccion cesta
|
2019-01-26 12:17:48 +01:00 |
|
Juan Ferrer
|
af5ab770ec
|
More cleaning, deps in routes.json, module autodetection
|
2019-01-26 02:30:46 +01:00 |
|
Juan Ferrer
|
8fc8292e72
|
Obsolete code & files removed
|
2019-01-25 23:02:29 +01:00 |
|
Juan Ferrer
|
71af7f6d0e
|
#981 Login fixes
|
2019-01-25 17:05:53 +01:00 |
|
Javi Gallego
|
2a447c2107
|
package sin bcrypt
|
2019-01-25 16:27:26 +01:00 |
|
Javi Gallego
|
30a8bb5ce3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-25 16:26:25 +01:00 |
|
Javi Gallego
|
d234b188a7
|
gulpfile bug de windows solucionado
|
2019-01-25 16:26:07 +01:00 |
Gerard
|
bb54ec3bdc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-25 16:22:04 +01:00 |
|
Gerard
|
c0a987b3d4
|
Revert "#1032 test failing"
This reverts commit 681ac605ff.
|
2019-01-25 16:21:23 +01:00 |
|
Gerard
|
681ac605ff
|
#1032 test failing
|
2019-01-25 16:20:47 +01:00 |
|
Juan Ferrer
|
f7980c49f5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-25 15:09:58 +01:00 |
|
Juan Ferrer
|
95c15a0ee9
|
#981 Login fixes
|
2019-01-25 15:09:29 +01:00 |
 Joan Sanchez
|
8f07ac1751
|
print fixes & claim pickup order
|
2019-01-25 15:08:11 +01:00 |
|
Carlos Jimenez Ruiz
|
5b252fbc47
|
#1040 ticket.step2
|
2019-01-25 12:52:12 +01:00 |
|
Gerard
|
984a765134
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-25 12:24:52 +01:00 |
|
Gerard
|
567f5aaa78
|
fixed bug localBank being null
|
2019-01-25 12:24:07 +01:00 |
|
Juan Ferrer
|
e76d0aaf71
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-25 12:04:46 +01:00 |
|
Juan Ferrer
|
013710c6b3
|
#981 Login bugs fixed, cookies disabled, session remember by default
|
2019-01-25 12:04:35 +01:00 |
|
Gerard
|
6e6b646978
|
#1022 ticket.create
|
2019-01-25 11:58:50 +01:00 |
|
Gerard
|
e55bcaecfd
|
#1022 solved bug doesent overiding old data in localstorage if users had ben using the old version of this component
|
2019-01-25 09:05:57 +01:00 |
|
Gerard
|
f4839cb642
|
#1022 ticket.create
|
2019-01-25 08:50:13 +01:00 |
|
Gerard
|
12cf059534
|
test excluded #1022
|
2019-01-24 16:32:14 +01:00 |
|
Carlos Jimenez Ruiz
|
d19809c318
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-24 16:14:10 +01:00 |
|
Gerard
|
044207d811
|
#1022 styles added
|
2019-01-24 16:07:11 +01:00 |
|
Gerard
|
f83c721c95
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-24 16:05:41 +01:00 |
|
Carlos Jimenez Ruiz
|
d6255bc997
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-24 16:05:37 +01:00 |
|
Carlos Jimenez Ruiz
|
b111480023
|
removed bcrypt due to backend error upon login
|
2019-01-24 16:05:07 +01:00 |
|
Juan Ferrer
|
e600a4b5b7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-24 16:04:51 +01:00 |
|
Juan Ferrer
|
bfb2f7f533
|
#981 vnLeftMenu fixes
|
2019-01-24 16:04:38 +01:00 |
|
Gerard
|
5fce69cd5c
|
#1022 ticket.create
|
2019-01-24 15:50:21 +01:00 |
|
Carlos Jimenez Ruiz
|
18d7d07f56
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-24 15:41:56 +01:00 |
|
Carlos Jimenez Ruiz
|
7096273800
|
#1045 ticket.datos basicos
|
2019-01-24 15:41:48 +01:00 |
|
Carlos Jimenez Ruiz
|
1337e0e92f
|
#1051 Traducciones que fallan
|
2019-01-24 15:35:45 +01:00 |
|
Joan Sanchez
|
74421790db
|
print reportEngine fixes & claim report #1044
|
2019-01-24 15:03:01 +01:00 |
Bernat
|
31dc2bd5e2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-24 14:15:16 +01:00 |
|
Bernat
|
6f316d54b4
|
#9477 update fixtures and structure
|
2019-01-24 14:15:08 +01:00 |
|
Carlos Jimenez Ruiz
|
f33587a0b7
|
#1051 Traducciones que fallan
|
2019-01-24 14:03:01 +01:00 |
|
Carlos Jimenez Ruiz
|
6bfa39e0eb
|
#1030 ticket.index orden siempre por fecha ascencente
|
2019-01-24 13:50:57 +01:00 |