nelo
|
c026619c6d
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2017-01-23 10:45:46 +01:00 |
 Javi Gallego
|
27608619e6
|
label client
|
2017-01-23 08:59:18 +01:00 |
|
nelo
|
93c37ac964
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2017-01-23 07:55:28 +01:00 |
|
Javi Gallego
|
07356fa42d
|
solucionado error guardado Web
|
2017-01-23 07:48:39 +01:00 |
|
nelo
|
f8cf1efac3
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2017-01-23 07:23:31 +01:00 |
|
nelo
|
83632dc3f1
|
modificaciones servidor consignatarios
|
2017-01-23 07:23:16 +01:00 |
Juan Ferrer Toribio
|
5da711e98d
|
Combo v7
|
2017-01-22 23:21:02 +01:00 |
|
Juan Ferrer Toribio
|
8ded908204
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2017-01-20 15:51:26 +01:00 |
|
Juan Ferrer Toribio
|
757ec02d4e
|
Combo v6: Cargar mas, Peticiones optimizadas, Errores
|
2017-01-20 15:51:17 +01:00 |
|
Juan Ferrer Toribio
|
0d4e769906
|
Combo v6
|
2017-01-20 12:43:58 +01:00 |
|
Javi Gallego
|
b953d7fa4f
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2017-01-20 12:43:44 +01:00 |
|
Javi Gallego
|
470ff7a6aa
|
algun consignatario de prueba
|
2017-01-20 12:43:38 +01:00 |
|
Javi Gallego
|
c298205e2f
|
alineacion del activo del descriptor
|
2017-01-20 09:34:55 +01:00 |
|
Javi Gallego
|
43b1a987a8
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2017-01-20 09:22:55 +01:00 |
|
Javi Gallego
|
eb4f6f91c1
|
vnDialogConfirm css
|
2017-01-20 09:22:47 +01:00 |
|
Juan Ferrer Toribio
|
a74925d380
|
Bug combo solucionado
|
2017-01-19 19:15:07 +01:00 |
|
Juan Ferrer Toribio
|
1834068123
|
Datos añadidos a db.json
|
2017-01-19 19:03:06 +01:00 |
|
Juan Ferrer Toribio
|
768b27ae9e
|
Combo v5
|
2017-01-19 18:48:33 +01:00 |
|
Juan Ferrer Toribio
|
8061d58ad8
|
Combo v3
|
2017-01-19 18:11:30 +01:00 |
|
Juan Ferrer Toribio
|
c4afb057aa
|
Errores solucionados
|
2017-01-19 14:47:51 +01:00 |
|
Juan Ferrer Toribio
|
17de3cbe5b
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2017-01-19 14:45:59 +01:00 |
|
Juan Ferrer Toribio
|
3e16417965
|
Combo v3
|
2017-01-19 14:45:50 +01:00 |
|
nelo
|
47fec183a7
|
notas
|
2017-01-19 13:21:01 +01:00 |
|
Juan Ferrer Toribio
|
33711c5e33
|
Combo v2
|
2017-01-19 10:51:46 +01:00 |
|
Juan Ferrer Toribio
|
9fcf18594a
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2017-01-18 18:07:26 +01:00 |
|
Juan Ferrer Toribio
|
64d6f87175
|
Combo beta, CSS layout
|
2017-01-18 18:07:16 +01:00 |
|
nelo
|
ce055f4f3e
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2017-01-18 14:48:50 +01:00 |
|
nelo
|
aa23160aee
|
Separación de notas en listar y crear
|
2017-01-18 14:48:35 +01:00 |
|
Javi Gallego
|
dead10641b
|
merge
|
2017-01-18 13:51:45 +01:00 |
|
Javi Gallego
|
8a3dcb4698
|
webAccess sin error dialog
|
2017-01-18 13:49:04 +01:00 |
|
Javi Gallego
|
eab5af19b5
|
webAcces guarda
|
2017-01-18 12:02:02 +01:00 |
|
nelo
|
28451aced9
|
comprobación modificación consignatario
|
2017-01-18 10:50:51 +01:00 |
|
nelo
|
2694b14c53
|
validación consignatarios
|
2017-01-18 10:42:53 +01:00 |
Vicente Falco
|
6df0999844
|
paging
|
2017-01-18 08:41:22 +01:00 |
|
nelo
|
8926299caa
|
modificaciones
|
2017-01-18 07:58:52 +01:00 |
|
Juan Ferrer Toribio
|
b13fdaa25d
|
Dialog: errores solucionados; Cambiar contraseña
|
2017-01-17 17:50:46 +01:00 |
|
Juan Ferrer Toribio
|
1e282656ab
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2017-01-17 16:08:43 +01:00 |
|
Javi Gallego
|
a5f378b70a
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2017-01-17 15:04:50 +01:00 |
|
Javi Gallego
|
826b340c20
|
clientObservation contra modelo correcto
|
2017-01-17 15:03:32 +01:00 |
|
nelo
|
4a065d073d
|
Merge con vicente
|
2017-01-17 14:33:06 +01:00 |
|
Juan Ferrer Toribio
|
e0e070b969
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2017-01-17 13:18:20 +01:00 |
|
nelo
|
5b69f24902
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2017-01-17 13:17:51 +01:00 |
|
nelo
|
163f10d442
|
index dividido en tres
|
2017-01-17 13:17:22 +01:00 |
|
Juan Ferrer Toribio
|
02f8363c69
|
Merge
|
2017-01-17 13:12:05 +01:00 |
|
Juan Ferrer Toribio
|
3a5e718066
|
Merge
|
2017-01-17 13:09:27 +01:00 |
|
Javi Gallego
|
b469b52ba1
|
merge index.html
|
2017-01-17 13:06:08 +01:00 |
|
nelo
|
ec5c70ed94
|
modificaciones estilos
|
2017-01-17 13:03:04 +01:00 |
|
Javi Gallego
|
102c344859
|
dialog-confirm y acceso-Web
dialog-confirm ahora es generico y se ha añadido la entidad account
|
2017-01-17 13:02:35 +01:00 |
|
nelo
|
8f372a7331
|
modificación estilos css
|
2017-01-17 12:24:32 +01:00 |
|
nelo
|
76df23ec00
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2017-01-17 11:27:02 +01:00 |