nelo
|
e9d222d2b1
|
modificaciones para hacer el pull
|
2016-12-15 08:31:15 +01:00 |
|
nelo
|
3b8c0d52b6
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
# Conflicts:
# @salix/app/src/configroutes.js
# @salix/crud/src/client/addresses/index.js
|
2016-12-13 15:12:37 +01:00 |
|
nelo
|
68b5c7aa8e
|
inyeccion para minimificar
|
2016-12-13 15:09:54 +01:00 |
jgallego
|
2500822857
|
controllerAs
|
2016-12-13 14:21:30 +01:00 |
|
nelo
|
95546c9018
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
# Conflicts:
# @salix/app/src/components/main-menu/main-menu.html
|
2016-12-01 15:16:36 +01:00 |
|
nelo
|
d4fedb2cbb
|
Separación de la search bar del top bar
|
2016-12-01 15:14:37 +01:00 |
Juan Ferrer Toribio
|
b1cf21eac9
|
Logout
|
2016-12-01 12:45:36 +01:00 |
|
Juan Ferrer Toribio
|
76ed8478c1
|
Consignatarios
|
2016-11-28 18:21:55 +01:00 |
|
Juan Ferrer Toribio
|
6ed1a92773
|
Items left menu
|
2016-11-25 15:35:26 +01:00 |
|
nelo
|
fd18740c00
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2016-11-23 13:10:02 +01:00 |
|
Juan Ferrer Toribio
|
f260a45499
|
Scripts de arranque, entorno desarrollo optimizado
|
2016-11-23 11:44:33 +01:00 |
|
nelo
|
3fb7bc0769
|
client
|
2016-11-22 13:20:44 +01:00 |
SAMBA\vfalco
|
b0a9bd2334
|
clientes_databasic
|
2016-11-21 12:31:00 +01:00 |
|
SAMBA\vfalco
|
7e519cc0a1
|
db.json
|
2016-11-21 08:47:23 +01:00 |
|
Juan Ferrer Toribio
|
c91256b41c
|
Archivos reestructurados
|
2016-11-18 14:25:16 +01:00 |
|
Juan Ferrer Toribio
|
fae7deb13f
|
Merge
|
2016-11-18 14:16:11 +01:00 |
|
Juan Ferrer Toribio
|
4b50924243
|
Script arranque, @salix-services renombrado
|
2016-11-18 14:12:57 +01:00 |