Commit Graph

18625 Commits

Author SHA1 Message Date
Vicente Falco b025af07ba basic-data name 2017-01-02 14:02:10 +01:00
Vicente Falco 178b41a6ba mdl css 2017-01-02 13:28:34 +01:00
Vicente Falco 378b4935a3 mdl css 2017-01-02 13:05:24 +01:00
Vicente Falco f197ed0b4a cambios 2017-01-02 12:59:37 +01:00
Vicente Falco 6e095d61ec label overlap textbox 2017-01-02 12:51:40 +01:00
Javi Gallego 5d9eb50527 canvio crlf 2017-01-02 12:27:09 +01:00
Javi Gallego 58b38a6971 guardar formularios 2017-01-02 07:44:26 +01:00
Javi Gallego b7bbf4a8b0 guardar formularios 2017-01-02 07:28:36 +01:00
Vicente Falco 1dd69db8b2 gulp y dev windows 2016-12-28 15:09:02 +01:00
nelo 98dada7c8c Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
# Conflicts:
#	@salix/crud/src/client/basic-data/index.html
2016-12-15 16:57:28 +01:00
nelo 6eca92afcc create client
combobox comerciales
put client
2016-12-15 16:55:11 +01:00
Juan Ferrer Toribio 2920f7acda Angular translate incluido, Componentes core traducibles 2016-12-15 13:57:45 +01:00
Juan Ferrer Toribio 58d8176a42 Errores al minificar login detectados 2016-12-15 12:12:43 +01:00
Juan Ferrer Toribio 0e9628436e file.relative solucionado 2016-12-15 11:26:15 +01:00
nelo 440e9705d2 Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
# Conflicts:
#	@salix/crud/src/client/basic-data/index.html
2016-12-15 08:34:07 +01:00
nelo e9d222d2b1 modificaciones para hacer el pull 2016-12-15 08:31:15 +01:00
Juan Ferrer Toribio 441537bffb Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix 2016-12-14 09:31:05 +01:00
Juan Ferrer Toribio bd0e68d98b Merge 2016-12-14 09:30:56 +01:00
Juan Ferrer Toribio ae70f9b509 Merge 2016-12-14 09:30:46 +01:00
nelo ea70fecf35 minimificado 2016-12-14 09:03:39 +01:00
Juan Ferrer Toribio dba859c5a2 Directiva focus, InputAttrsNormalizer 2016-12-14 08:43:10 +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 7fd675df34 clientes 2016-12-13 09:37:20 +01:00
nelo b18b37cbee Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix 2016-12-13 09:32:03 +01:00
nelo 2f77d371e9 params config routes
cargamos clientes
2016-12-13 09:31:50 +01:00
Vicente Falco 1f680d162c dev windows carpeta temp 2016-12-13 08:08:05 +01:00
nelo ab0b9aee33 Navegación entre rutas
parte del inject
2016-12-07 14:59:21 +01:00
Juan Ferrer Toribio b82e8941f4 Rutas 2016-12-05 09:50:40 +01:00
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