Juan Ferrer Toribio
|
6fa4ade789
|
Merge
|
2016-12-01 18:09:29 +01:00 |
|
Juan Ferrer Toribio
|
bbc2cf693a
|
Rutas en plural
|
2016-12-01 17:22:37 +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
|
b80fd31df1
|
Main menu
|
2016-12-01 12:49:54 +01:00 |
|
Juan Ferrer Toribio
|
2d09f9e053
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2016-12-01 12:45:58 +01:00 |
|
Juan Ferrer Toribio
|
b1cf21eac9
|
Logout
|
2016-12-01 12:45:36 +01:00 |
 Javi Gallego
|
c01ea521a8
|
style con require
|
2016-12-01 08:42:13 +01:00 |
|
Javi Gallego
|
6d6b0cbace
|
descriptor en app
|
2016-12-01 08:37:43 +01:00 |
|
Javi Gallego
|
d9497a8f60
|
descriptor en app
|
2016-12-01 08:37:25 +01:00 |
|
Juan Ferrer Toribio
|
285fbefe0f
|
Errores solucionados, vn-title
|
2016-12-01 00:40:36 +01:00 |
|
Juan Ferrer Toribio
|
b91d575e93
|
mt -> Mdl
|
2016-11-30 23:07:28 +01:00 |
|
Juan Ferrer Toribio
|
9266fdd59e
|
MT overrides, sin mayúsculas, botón naranja, rutas sin tags
|
2016-11-30 18:08:03 +01:00 |
|
Juan Ferrer Toribio
|
f4ce536a12
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2016-11-30 16:48:35 +01:00 |
|
Juan Ferrer Toribio
|
04609b0b4e
|
width 100% textfield
|
2016-11-30 16:48:32 +01:00 |
|
Javi Gallego
|
1973fe5254
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2016-11-30 14:34:38 +01:00 |
|
nelo
|
1de495e155
|
Movidos los componentes comunes a app
Arreglado problems material design ui-router
|
2016-11-30 14:12:48 +01:00 |
|
Javi Gallego
|
d451dfc6f5
|
cambios pedro miercoles mañana
|
2016-11-30 13:26:17 +01:00 |
|
Juan Ferrer Toribio
|
f9f6e9c507
|
Merge + Login
|
2016-11-29 16:55:10 +01:00 |
|
Juan Ferrer Toribio
|
c84086d146
|
Layout datos basicos
|
2016-11-29 15:21:58 +01:00 |
|
nelo
|
e740a0aba1
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
# Conflicts:
# @salix/crud/src/client/basic-data/index.html
# @salix/crud/src/client/client.js
# @salix/crud/src/client/index/index.js
# @salix/crud/src/client/routes.js
|
2016-11-29 15:01:46 +01:00 |
|
nelo
|
8705324085
|
buscador de clientes
|
2016-11-29 14:56:05 +01:00 |
|
Javi Gallego
|
c78ddc77d4
|
merge
|
2016-11-29 14:54:17 +01:00 |
|
Javi Gallego
|
6cddd841c0
|
fiscal-data
|
2016-11-29 14:50:40 +01:00 |
SAMBA\vfalco
|
ce34c4c151
|
model access-web
|
2016-11-29 14:50:10 +01:00 |
|
SAMBA\vfalco
|
6fb1ae4112
|
basic-data
|
2016-11-29 13:26:25 +01:00 |
|
SAMBA\vfalco
|
7e1b4d6c7e
|
Client access web
|
2016-11-29 13:22:19 +01:00 |
|
Juan Ferrer Toribio
|
ced1e8669a
|
Uppercase
|
2016-11-29 13:13:17 +01:00 |
|
Juan Ferrer Toribio
|
b8df169eeb
|
Consignatarios acabado
|
2016-11-29 13:00:15 +01:00 |
|
Juan Ferrer Toribio
|
eafbcb1915
|
Estilos CSS - Bordes, fuente
|
2016-11-29 10:14:31 +01:00 |
|
Juan Ferrer Toribio
|
bb72b4c251
|
Errores
|
2016-11-28 18:33:03 +01:00 |
|
Juan Ferrer Toribio
|
631ce155d1
|
Consignatarios
|
2016-11-28 18:30:52 +01:00 |
|
Juan Ferrer Toribio
|
76ed8478c1
|
Consignatarios
|
2016-11-28 18:21:55 +01:00 |
|
Juan Ferrer Toribio
|
35462251ba
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2016-11-28 16:23:11 +01:00 |
|
nelo
|
c3c76e3cb1
|
details por basic data
|
2016-11-28 14:52:32 +01:00 |
|
nelo
|
f344f90885
|
modificaciones ui-router para que cargue las subsistas
|
2016-11-28 14:42:37 +01:00 |
|
Juan Ferrer Toribio
|
c6d4d47dec
|
Guardar cliente
|
2016-11-28 10:18:33 +01:00 |
|
Juan Ferrer Toribio
|
a930b15963
|
Merge
|
2016-11-25 15:48:57 +01:00 |
|
Juan Ferrer Toribio
|
6ed1a92773
|
Items left menu
|
2016-11-25 15:35:26 +01:00 |
|
Javi Gallego
|
96b35cd205
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2016-11-25 15:34:00 +01:00 |
|
Javi Gallego
|
ea330b782f
|
Ficha Cliente resumida
|
2016-11-25 15:33:27 +01:00 |
|
nelo
|
221244cbf0
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2016-11-24 15:10:16 +01:00 |
|
nelo
|
e4cec04eb7
|
Cambiar customer por databais
Incluido views en config-routes
Modificaciones top bar
|
2016-11-24 15:10:13 +01:00 |
|
Javi Gallego
|
dee8724005
|
Merge branches 'master' and 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2016-11-24 11:55:56 +01:00 |
|
nelo
|
574e2ce12f
|
modificaciones left menu para que bindee
|
2016-11-24 11:10:59 +01:00 |
|
Javi Gallego
|
fa36194a3e
|
dev.cmd modificado con el start
|
2016-11-24 10:56:22 +01:00 |
|
Juan Ferrer Toribio
|
de84b3bffa
|
Log webpack reducido
|
2016-11-23 18:56:12 +01:00 |
|
Juan Ferrer Toribio
|
9a0e5e1646
|
Estilos
|
2016-11-23 17:25:19 +01:00 |
|
nelo
|
94e4fda6bb
|
Modificaciones css
|
2016-11-23 15:00:17 +01:00 |
|
nelo
|
fd18740c00
|
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
|
2016-11-23 13:10:02 +01:00 |