Commit Graph

677 Commits

Author SHA1 Message Date
Juan Ferrer Toribio 9d4acfc64f Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-17 21:23:54 +02:00
Juan Ferrer Toribio 4eff9d451b Autenticación por token 2017-05-17 21:23:47 +02:00
nelo 726bb73ca0 Todos heredan de MyModel 2017-05-17 14:58:23 +02:00
Vicente Falco 5f9160c172 ng-disabled vn-textfield 2017-05-17 14:04:02 +02:00
Vicente Falco 39f5f55714 merge 2017-05-17 13:18:20 +02:00
Vicente Falco 73f464cae5 merge 2017-05-17 13:15:16 +02:00
Juan Ferrer Toribio 5db994e263 Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-17 12:14:17 +02:00
Juan Ferrer Toribio a7bfd5122a Errores gulp solucionados 2017-05-17 12:07:42 +02:00
nelo e4559c3959 Corrección error autocomplete
Separado meted activate
Separado meted addresses
2017-05-17 09:45:34 +02:00
nelo ae3f9db948 VnAutocomplete ya no carga los datos cuando los datos se pueden bandera.
Creado el método card en client para listar el cliente con sus datos para el combo.
2017-05-17 08:19:03 +02:00
Juan Ferrer Toribio bdb7cf9ed3 Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-16 14:25:48 +02:00
Vicente Falco ba6b9c5a89 fiscal-data IBAN html 2017-05-16 13:44:25 +02:00
Juan Ferrer Toribio c4978b24fb Errores eslint, scripts dev 2017-05-16 12:37:48 +02:00
Vicente Falco fc37c59574 nginx 2017-05-15 11:12:00 +02:00
Vicente Falco d8df17ad07 salix routes static 2017-05-15 10:44:19 +02:00
Vicente Falco eacd133d00 Docker nginx 2017-05-15 09:03:05 +02:00
Vicente Falco 6a4235a9a2 Ajustes conf 2017-05-15 08:47:58 +02:00
Vicente Falco 77d8a8f090 Jenkins 2017-05-15 08:33:51 +02:00
Vicente Falco 8a9d8c83b6 docker 2017-05-15 08:07:30 +02:00
Vicente Falco 8c47938bd0 merge 2017-05-15 07:53:40 +02:00
Vicente Falco d5da337d52 Jenkins - docker nginx 2017-05-15 07:53:06 +02:00
Juan Ferrer Toribio 30ad456eea Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-12 15:22:00 +02:00
Juan Ferrer Toribio 60a3b049de Campos renombrados 2017-05-12 15:21:37 +02:00
Vicente Falco af49f03e19 merge 2017-05-12 14:52:44 +02:00
Vicente Falco ea04092470 Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-12 14:51:53 +02:00
Vicente Falco da5a9a39f2 Jenkinsfile 2017-05-12 14:47:15 +02:00
Juan Ferrer Toribio fbd3f4c623 Errores solucionados 2017-05-12 14:46:19 +02:00
Juan Ferrer Toribio 88992438e2 Errores solucionados 2017-05-12 13:58:08 +02:00
Juan Ferrer Toribio 34e0537b64 Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-12 13:36:56 +02:00
Juan Ferrer Toribio ebb59d1eef Errores en relaciones solucionados 2017-05-12 13:36:12 +02:00
Vicente Falco a9212721f1 docker nginx conf 2017-05-12 13:14:52 +02:00
Vicente Falco 4df1a7898c Merge commit 'd93c6e18853e572c097b9f8fee4885b6ab17ebae' into dev 2017-05-12 13:05:54 +02:00
Vicente Falco d93c6e1885 Jenkins - Docker 2017-05-12 12:41:35 +02:00
nelo 89f397da2c Arreglado ClientObservation 2017-05-12 11:20:32 +02:00
Juan Ferrer Toribio b7fb0bca98 Relaciones arregladas 2017-05-12 11:14:55 +02:00
nelo 8ce3325f06 Renombrado Chanel a ContactChannel 2017-05-11 14:19:43 +02:00
nelo 495e3b7c5e creado el modelo Chanel.
Se puede seleccionar en el cliente.
2017-05-11 13:01:33 +02:00
Vicente Falco 27d086843f Jenkins - Docker 2017-05-11 12:07:33 +02:00
Juan Ferrer Toribio 85184d71eb Modelo modificado 2017-05-10 17:18:25 +02:00
Juan Ferrer Toribio 0efdd3565e Modelos loopback 2017-05-09 14:04:44 +02:00
Juan Ferrer Toribio 0da217e9bc Errores solucionados 2017-05-05 13:32:07 +02:00
Juan Ferrer Toribio f7ec186a77 Errores solucionados 2017-05-05 12:54:47 +02:00
Juan Ferrer Toribio f8cd8ee776 Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix 2017-04-28 15:04:36 +02:00
Juan Ferrer Toribio ce2d7936af Integración con MySQL, errores solucionados 2017-04-28 15:04:29 +02:00
Vicente Falco 0cf11ceff0 i18n loopback client 2017-03-31 12:12:46 +02:00
Juan Ferrer Toribio 1eb0fb9c8d Merge 2017-03-14 13:11:34 +01:00
Juan Ferrer Toribio f1c5a45657 ACLs habilitadas 2017-03-14 13:08:55 +01:00
Vicente Falco 4bc1cf455b notes: Crear 2017-03-10 11:18:16 +01:00
Vicente Falco 5e66bef50c Clientes: Recordar campos busqueda avanzada 2017-03-10 07:19:43 +01:00
Juan Ferrer Toribio 7059eadfc7 Correciones varias 2017-03-07 17:11:56 +01:00