Commit Graph

167 Commits

Author SHA1 Message Date
Daniel Herrero 6d4a4af3da merge conflict 2018-02-07 09:57:49 +01:00
Daniel Herrero 810db634d3 auto create nginx tmp folder 2018-02-07 09:53:45 +01:00
Daniel Herrero c099d3f021 auto create nginx temp folder 2018-02-07 09:51:51 +01:00
Juan Ferrer Toribio 5ff996a4c7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-05 19:34:12 +01:00
Juan Ferrer Toribio 90ce07881a Gulpfile refactor, SQL scripts 2018-02-05 19:34:04 +01:00
Joan Sanchez 692a226b69 El servicio de Nginx ahora se inicia desde Gulp. Añadido alias de instalacion "gulp i". 2018-02-05 19:22:38 +01:00
Juan Ferrer Toribio 89c745244a YAML configuration, client module register simplified 2018-02-04 19:39:56 +01:00
Juan Ferrer Toribio 3e2e2f3c3a Client i18n now uses YAML format 2018-02-04 15:46:46 +01:00
Juan Ferrer Toribio 4a388f241c Gulp refactor 2018-02-03 23:07:28 +01:00
Juan Ferrer Toribio e7d3ff9272 Refactor gulp and config 2018-02-03 22:53:02 +01:00
Juan Ferrer Toribio 597299b1c5 Autogenerated Nginx config and docker compose 2018-02-03 20:14:44 +01:00
Carlos Jimenez 099fbc1c9f gulpfile updated to restart enginx upon services task 2018-02-02 12:38:34 +01:00
Javi Gallego ac8db83582 README fixes, bugfixes for windows 2018-02-02 09:51:38 +01:00
Carlos Jimenez a7f4736c12 updated files accordantly 2018-02-01 16:01:49 +01:00
Daniel Herrero 81c234f26f gulp error fixed 2018-02-01 14:28:28 +01:00
Juan Ferrer Toribio 57479aaf76 Bug fixes 2018-02-01 12:52:58 +01:00
Juan Ferrer Toribio 86830bc2d2 Gulp file reorganized 2018-02-01 08:48:54 +01:00
Juan Ferrer Toribio 87b3ac995d Development environment now points to local database by default 2018-01-31 14:56:55 +01:00
Juan Ferrer Toribio 3d6f9fbbca Backend tests refactor, bug fixes 2018-01-31 12:17:17 +01:00
Juan Ferrer Toribio a3188b204f Views migrated to vn schema, Node v8, Error handling, async-await, bugs solved 2018-01-29 12:37:54 +01:00
Carlos Jimenez 953eca5ad7 gulp file bug corrected for nginxRestart task 2018-01-12 12:54:17 +01:00
Carlos Jimenez c86808603e gulp task for nginx and client to be launched in sequence 2018-01-11 08:12:21 +01:00
Carlos Jimenez 49486f302e corrected maxTimer usage in gulpfile watiForMySQL task plus some more e2e tests for the greuge path 2018-01-09 15:31:25 +01:00
Joan Sanchez 23a7a1a707 SetInterval up to 30s waitForMySQL 2018-01-08 15:35:37 +01:00
Carlos Jimenez 6607b62f81 gulp tasks for development services start 2018-01-08 15:06:20 +01:00
Carlos Jimenez 32a542a81d successfully merged sequences for gulp docker and end to end tests 2018-01-08 13:40:05 +01:00
Carlos Jimenez 2715699a35 gulp tasks updated for e2e testing 2018-01-08 10:49:41 +01:00
Carlos Jimenez 22d482f1c6 gulp task created to run fixtures before e2e tests 2018-01-08 09:42:16 +01:00
Carlos Jimenez c1e798790f e2e path for add credit and gulp tasks for faster fixtures in progress 2018-01-08 08:12:39 +01:00
Vicente Falco 1c5a65928e change on services, docker localDB y jasmime 2017-10-24 08:56:18 +02:00
vicentefalco d07f65893d docker DB local 2017-10-18 18:26:40 +02:00
vicentefalco a0955cf50d docker dbLocal 2017-10-18 06:41:17 +02:00
Juan Ferrer Toribio 82e4fdab68 Habilitado servicio route 2017-10-13 16:57:48 +02:00
Juan Ferrer Toribio 08da6c9713 Eliminando código redundante v1 2017-10-11 15:36:47 +02:00
dherrero 431032177c new micro-service route: need reinstall all dependencies 2017-10-05 14:26:04 +02:00
dherrero 4d487e7980 estructure for new module route 2017-10-05 12:38:28 +02:00
Juan Ferrer Toribio f647e9e2d1 Modelos y código común para servicios loopback 2017-09-26 16:59:24 +02:00
Vicente Falco ba8f0aaf80 install packages on folders with file package.json - gulp install 2017-09-17 17:42:01 +02:00
Vicente Falco 700be7c5a6 WDS Error windows 2017-09-17 15:09:10 +02:00
Dani Herrero 886c0f1e50 editado gulp para que no elimine la carpeta imagenes 2017-07-12 07:49:45 +02:00
Dani Herrero 9072b100f9 tooltip admite plantilla html, icon-menu forzado de posicion en dropDown 2017-06-15 07:45:01 +02:00
Joan Sanchez 9aa549cfc5 No mostrar dia de pago en metodo de pago por tarjeta. 2017-06-08 16:53:10 +02:00
Dani Herrero 3806e9e591 nueva directiva vn-tooltip 2017-06-08 09:29:03 +02:00
nelo 97fbc75e05 Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-06-07 08:38:53 +02:00
nelo ce256b395e tarea gula para copiar los ficheros comunes
puerto 3004 para production
2017-06-07 08:38:48 +02:00
Dani Herrero 9fcdb28d14 cambio en routes e interfaz localizador al 5% 2017-06-06 13:06:47 +02:00
Juan Ferrer Toribio 02d0e167a0 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-06-02 15:23:30 +02:00
Juan Ferrer Toribio f9842000d3 Codigo gulp reorganizado, errores redirección solucionados 2017-06-02 15:23:19 +02:00
Javi Gallego 64dea096e0 test cambio https 2017-06-02 14:17:57 +02:00
Juan Ferrer Toribio b42209b2f6 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-05-31 13:53:10 +02:00
Vicente Falco 65cc23b280 gulp services y service mailer 2017-05-30 08:50:16 +02:00
Juan Ferrer Toribio d16516ba05 Prueba 2017-05-29 18:48:50 +02:00
Juan Ferrer Toribio 2cfdc34af7 Prueba 2017-05-29 13:38:40 +02:00
Juan Ferrer Toribio a7bfd5122a Errores gulp solucionados 2017-05-17 12:07:42 +02:00
Juan Ferrer Toribio c4978b24fb Errores eslint, scripts dev 2017-05-16 12:37:48 +02:00
Juan Ferrer Toribio 7059eadfc7 Correciones varias 2017-03-07 17:11:56 +01:00
Juan Ferrer Toribio 2cc7d96dce Eslint 2017-03-01 09:55:17 +01:00
Juan Ferrer Toribio 9765b478ff Errores solucionados, VnWatcher, fucionalidad añadida al dialog 2017-02-06 18:01:04 +01:00
Juan Ferrer Toribio 2498f8ecf2 Dependencias innecesarias eliminadas 2017-01-31 15:58:28 +01:00
Juan Ferrer Toribio abf6a6c142 Cargador modulos: modulo ng, validaciones, traducciones 2017-01-31 14:13:06 +01:00
Javi Gallego 0840f59a64 reorganizacion de directorios 2016-11-04 11:32:27 +01:00
Juan Ferrer Toribio 8905d685f7 Rutas y splitings generados automaticamente 2016-10-21 08:38:58 +02:00
Juan Ferrer Toribio 9f7be0dbbe Errores al generar rutas solucionados 2016-10-18 10:36:16 +02:00
Juan Ferrer Toribio d9bfd1b579 Concatenar rutas con Gulp 2016-10-10 11:15:05 +02:00
Juan Ferrer Toribio 5a4a41d630 Concat de rutas JS con Gulp, servidor express sirve routes.js 2016-10-07 11:44:24 +02:00
Juan Ferrer Toribio 86a19c47ee CORS en servidor express, cargador de rutas 2016-10-06 15:32:03 +02:00
Juan Ferrer Toribio 287fd05864 Concatena JSON de rutas usando Gulp 2016-10-06 11:18:02 +02:00