Carlos Jimenez
|
845dfc77bb
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-02-12 10:53:43 +01:00 |
|
Carlos Jimenez
|
100b5a09ed
|
fixtures for item log
|
2018-02-12 10:53:03 +01:00 |
SAMBA\bernat
|
7f08796828
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-12 08:10:50 +01:00 |
Juan Ferrer Toribio
|
88d50e3d00
|
Core refactor, first step
|
2018-02-10 16:18:01 +01:00 |
|
Juan Ferrer Toribio
|
8852bfd4bb
|
Bug solved: Modules are not loaded when language is not recognized
|
2018-02-10 11:41:29 +01:00 |
|
Juan Ferrer Toribio
|
b45ab59076
|
Updated template datasources.json
|
2018-02-09 15:10:33 +01:00 |
|
SAMBA\bernat
|
b2edcaf472
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-09 14:45:29 +01:00 |
|
Juan Ferrer Toribio
|
f79b70e264
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-09 12:43:17 +01:00 |
|
Juan Ferrer Toribio
|
d369db9dc0
|
Debug fixes
|
2018-02-09 12:43:14 +01:00 |
Vicente Falco
|
e1a565ae1f
|
Merge branch 'dev' of https://git.verdnatura.es:/salix into test
|
2018-02-09 12:27:32 +01:00 |
|
Vicente Falco
|
58d5e7add9
|
Services Jenkins
|
2018-02-09 12:26:27 +01:00 |
|
Juan Ferrer Toribio
|
6af6ca9c34
|
Merge
|
2018-02-09 09:12:22 +01:00 |
|
Carlos Jimenez
|
540a65476b
|
fixtures updated
|
2018-02-09 08:54:53 +01:00 |
|
Juan Ferrer Toribio
|
a84c6f6de7
|
Merge branch 'unstable' of https://git.verdnatura.es/salix into unstable
|
2018-02-09 08:40:28 +01:00 |
|
Juan Ferrer Toribio
|
7b7ee2662f
|
Gulpfile: known bugs solved, performance improbements
|
2018-02-09 08:40:23 +01:00 |
|
Carlos Jimenez
|
861ed0e78f
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-02-08 14:53:12 +01:00 |
|
Carlos Jimenez
|
32cd96b443
|
item history now shows descriptions acction changed by and date order or collumns
|
2018-02-08 14:52:24 +01:00 |
Daniel Herrero
|
1ccf108ddc
|
packageLock
|
2018-02-08 14:45:39 +01:00 |
|
Daniel Herrero
|
2fe4245ea5
|
packages version
|
2018-02-08 14:41:05 +01:00 |
|
Carlos Jimenez
|
e11e0be029
|
fixtures for addresses listed for Bruce Banner are now enough to trigger pagination
|
2018-02-08 14:40:32 +01:00 |
|
Juan Ferrer Toribio
|
fd14e29884
|
Webpack 3
|
2018-02-08 13:47:54 +01:00 |
|
Daniel Herrero
|
5ac17fe8de
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-08 13:28:12 +01:00 |
|
Daniel Herrero
|
6387f6cedb
|
noteCreate fixed
|
2018-02-08 13:28:01 +01:00 |
|
Juan Ferrer Toribio
|
156eb61be5
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-08 13:13:50 +01:00 |
|
Juan Ferrer Toribio
|
f7ea8e6435
|
watcher lint
|
2018-02-08 13:13:42 +01:00 |
|
Vicente Falco
|
725fe79022
|
package md5
|
2018-02-08 13:11:15 +01:00 |
|
Vicente Falco
|
f8dd52bd99
|
merge
|
2018-02-08 13:06:36 +01:00 |
|
Vicente Falco
|
d6b010387a
|
service auth package md5
|
2018-02-08 13:06:12 +01:00 |
|
Daniel Herrero
|
d0432140d7
|
create address fixed
|
2018-02-08 12:57:57 +01:00 |
|
Carlos Jimenez
|
013880cb0a
|
item history html completed
|
2018-02-08 12:25:51 +01:00 |
|
Daniel Herrero
|
4ec0a3c46d
|
item history
|
2018-02-08 12:04:33 +01:00 |
|
Daniel Herrero
|
71eaa53dae
|
generic class to list models into view with mg-crud
|
2018-02-08 12:04:17 +01:00 |
|
Carlos Jimenez
|
76f808e7f6
|
itemLog for item history refactor
|
2018-02-08 11:40:06 +01:00 |
 Javi Gallego
|
378c04b123
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-08 09:44:32 +01:00 |
|
Daniel Herrero
|
3fa4658a7f
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-08 09:05:05 +01:00 |
|
Daniel Herrero
|
a3917aae32
|
addresses list improvement
|
2018-02-08 09:04:29 +01:00 |
|
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 |