Vicente Falco
|
f433f9039c
|
Merge branch 'dev' of https://git.verdnatura.es:/salix
|
2018-02-08 08:30:55 +01:00 |
|
Vicente Falco
|
6011a2ecaf
|
Docker
|
2018-02-08 08:30:24 +01:00 |
|
Vicente Falco
|
b719a1615d
|
Merge branch 'dev' of https://git.verdnatura.es:/salix
|
2018-02-08 07:57:28 +01:00 |
Daniel Herrero
|
abc527568d
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-08 07:54:32 +01:00 |
|
Daniel Herrero
|
a83bae465f
|
new tests added into address-edit
|
2018-02-08 07:54:20 +01:00 |
|
Vicente Falco
|
4ea65cdf80
|
gulp nginx
|
2018-02-08 07:51:24 +01:00 |
|
Daniel Herrero
|
80cf6f8cf6
|
Merge branch 'dev'
|
2018-02-08 07:17:08 +01:00 |
|
Vicente Falco
|
bf7a286b1c
|
Dockerfile
|
2018-02-08 07:15:25 +01:00 |
|
Daniel Herrero
|
9bfd1989f2
|
Merge branch 'dev'
|
2018-02-08 07:10:54 +01:00 |
|
Vicente Falco
|
ddcdedf838
|
merge
|
2018-02-08 07:08:12 +01:00 |
|
Vicente Falco
|
93faa93f31
|
gulp docker
|
2018-02-08 07:07:07 +01:00 |
Juan Ferrer Toribio
|
45606303fe
|
Script to import local-db changes, fixtures fixed, structure updated
|
2018-02-07 19:55:47 +01:00 |
|
Juan Ferrer Toribio
|
f84bf44550
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-07 16:45:50 +01:00 |
|
Juan Ferrer Toribio
|
4876f36190
|
Local database structure updated & import changes script
|
2018-02-07 16:45:40 +01:00 |
 Joan Sanchez
|
b0842fa086
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-07 15:33:46 +01:00 |
|
Joan Sanchez
|
433a0d1af4
|
services-run con posibilidad de pasar variable de entorno NODE_ENV = test
|
2018-02-07 15:33:43 +01:00 |
Carlos Jimenez
|
7f98e1dd2f
|
Merge branch 'dev'
|
2018-02-07 15:06:59 +01:00 |
|
Carlos Jimenez
|
3eed1e2124
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-02-07 15:06:40 +01:00 |
|
Carlos Jimenez
|
03faa09284
|
item history functionality, awaiting for clientfilters refactor
|
2018-02-07 15:06:21 +01:00 |
|
Vicente Falco
|
cc89fcac98
|
merge
|
2018-02-07 15:02:27 +01:00 |
|
Vicente Falco
|
d06ffba8b9
|
gulp docker
|
2018-02-07 15:02:16 +01:00 |
|
Carlos Jimenez
|
26a7c6a210
|
Merge branch 'dev'
|
2018-02-07 14:48:21 +01:00 |
|
Daniel Herrero
|
2cc6dfd553
|
changes in last test
|
2018-02-07 14:48:11 +01:00 |
|
Daniel Herrero
|
89a6a53157
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-07 14:47:55 +01:00 |
|
Daniel Herrero
|
a2fb33963b
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-07 14:47:16 +01:00 |
|
Daniel Herrero
|
87d423fd52
|
new testing in address-edit
|
2018-02-07 14:47:08 +01:00 |
|
Vicente Falco
|
17e596947f
|
merge
|
2018-02-07 14:46:20 +01:00 |
|
Vicente Falco
|
7b7464ecc1
|
Docker context
|
2018-02-07 14:45:39 +01:00 |
SAMBA\bernat
|
249a622e2d
|
update fixtures
|
2018-02-07 14:45:04 +01:00 |
|
Carlos Jimenez
|
45d1909781
|
Merge branch 'dev'
|
2018-02-07 14:40:16 +01:00 |
|
Vicente Falco
|
c61748ec95
|
Dockerfile Services
|
2018-02-07 14:37:26 +01:00 |
 Javi Gallego
|
220baa717e
|
roles de credito y greuges
|
2018-02-07 14:16:11 +01:00 |
|
Carlos Jimenez
|
64a8f6a812
|
Merge branch 'dev'
|
2018-02-07 13:50:07 +01:00 |
|
Carlos Jimenez
|
3d7d0762b6
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-02-07 13:49:05 +01:00 |
|
Carlos Jimenez
|
de9f7a5545
|
item history
|
2018-02-07 13:48:55 +01:00 |
|
Daniel Herrero
|
d251227107
|
changes in logic address-edit
|
2018-02-07 13:26:21 +01:00 |
|
Juan Ferrer Toribio
|
98b26a3c27
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-07 13:24:51 +01:00 |
|
Juan Ferrer Toribio
|
ca0731714a
|
Gulp bugs
|
2018-02-07 13:24:46 +01:00 |
|
Daniel Herrero
|
68f9bfd375
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-07 13:10:32 +01:00 |
|
Daniel Herrero
|
fb9ba713bd
|
addresses observations finish
|
2018-02-07 13:10:22 +01:00 |
|
Javi Gallego
|
7aa977e071
|
bug en gulpfile si se cierra inesperadamente nging
|
2018-02-07 12:14:41 +01:00 |
|
Juan Ferrer Toribio
|
fda8750304
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-07 10:29:27 +01:00 |
|
Juan Ferrer Toribio
|
0fc1dc0faa
|
Address id fixtures, gulpfile clean, eslint no-empty
|
2018-02-07 10:29:23 +01:00 |
|
Daniel Herrero
|
6d4a4af3da
|
merge conflict
|
2018-02-07 09:57:49 +01:00 |
|
Daniel Herrero
|
4a9856dd5a
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-07 09:54:43 +01:00 |
|
Daniel Herrero
|
810db634d3
|
auto create nginx tmp folder
|
2018-02-07 09:53:45 +01:00 |
|
Daniel Herrero
|
c099d3f021
|
auto create nginx temp folder
|
2018-02-07 09:51:51 +01:00 |
|
Carlos Jimenez
|
37bbedebaf
|
merge
|
2018-02-07 09:07:28 +01:00 |
|
Carlos Jimenez
|
2c712b4f84
|
merge
|
2018-02-07 09:01:44 +01:00 |
|
Carlos Jimenez
|
93ef3c7fea
|
item history js files implementation
|
2018-02-07 08:49:27 +01:00 |