Commit Graph

1877 Commits

Author SHA1 Message Date
Carlos Jimenez 3d7d0762b6 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-07 13:49:05 +01:00
Carlos Jimenez de9f7a5545 item history 2018-02-07 13:48:55 +01:00
Daniel Herrero d251227107 changes in logic address-edit 2018-02-07 13:26:21 +01:00
Juan Ferrer Toribio 98b26a3c27 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-07 13:24:51 +01:00
Juan Ferrer Toribio ca0731714a Gulp bugs 2018-02-07 13:24:46 +01:00
Daniel Herrero 68f9bfd375 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-07 13:10:32 +01:00
Daniel Herrero fb9ba713bd addresses observations finish 2018-02-07 13:10:22 +01:00
Javi Gallego 7aa977e071 bug en gulpfile si se cierra inesperadamente nging 2018-02-07 12:14:41 +01:00
Juan Ferrer Toribio fda8750304 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-07 10:29:27 +01:00
Juan Ferrer Toribio 0fc1dc0faa Address id fixtures, gulpfile clean, eslint no-empty 2018-02-07 10:29:23 +01:00
Daniel Herrero 6d4a4af3da merge conflict 2018-02-07 09:57:49 +01:00
Daniel Herrero 4a9856dd5a Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-07 09:54:43 +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
Carlos Jimenez 37bbedebaf merge 2018-02-07 09:07:28 +01:00
Carlos Jimenez 2c712b4f84 merge 2018-02-07 09:01:44 +01:00
Carlos Jimenez 93ef3c7fea item history js files implementation 2018-02-07 08:49:27 +01:00
Carlos Jimenez 8de88aa046 small refactor on greuge list and fixtures 2018-02-07 08:47:04 +01:00
Juan Ferrer Toribio 853b16bd81 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-07 08:30:20 +01:00
Carlos Jimenez 86aab2ca31 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-06 16:23:22 +01:00
Daniel Herrero 7eee1cad50 address observations crud created 2018-02-06 15:09:31 +01:00
Carlos Jimenez 335847358f fixtures addition plus item en.yml created 2018-02-06 14:03:09 +01:00
Carlos Jimenez e690a72dfe Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-06 10:55:49 +01:00
Daniel Herrero fd4b427518 bug fixed watcher 2018-02-06 09:33:37 +01:00
Juan Ferrer Toribio 65e197d555 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-06 09:10:57 +01:00
Carlos Jimenez 8f6f7fb2a3 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-06 09:08:02 +01:00
Carlos Jimenez 9c39974380 added expenses to create item form 2018-02-06 09:07:40 +01:00
Daniel Herrero f0356eb047 join addressObservation into list Addresses service 2018-02-06 07:59:36 +01:00
Daniel Herrero 19ddead326 package-lock updated 2018-02-06 07:24:10 +01:00
Daniel Herrero 806734fb13 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-06 07:01:47 +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
Carlos Jimenez d24058bab1 front unit tests for item card, item create and started over production index 2018-02-05 16:53:41 +01:00
Carlos Jimenez d77faf8e47 removed unused code from autocomplete spec and fixed a broken test from drop-down 2018-02-05 13:58:13 +01:00
Carlos Jimenez 1a1f861205 front unit tests for address-edit, fiscal-data and removed spec file for search-panel as theres nothing to test anymore 2018-02-05 10:58:49 +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 cf2f8b77ff Log removed 2018-02-03 23:54:31 +01:00
Juan Ferrer Toribio d1096a270f Bugs solved in Nginx starting scripts 2018-02-03 23:46:52 +01:00
Juan Ferrer Toribio 4a388f241c Gulp refactor 2018-02-03 23:07:28 +01:00
Juan Ferrer Toribio 681310d9b6 Dockerfile bug 2018-02-03 22:56:49 +01:00
Juan Ferrer Toribio e7d3ff9272 Refactor gulp and config 2018-02-03 22:53:02 +01:00
Juan Ferrer Toribio 2415619a13 Generated files removed from project 2018-02-03 20:20:37 +01:00
Juan Ferrer Toribio 3b17ed3583 Gitignore 2018-02-03 20:16:40 +01:00
Juan Ferrer Toribio 6542a350ff Gitignore 2018-02-03 20:16:22 +01:00
Juan Ferrer Toribio ca7e299fbc Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-03 20:14:52 +01:00
Juan Ferrer Toribio 597299b1c5 Autogenerated Nginx config and docker compose 2018-02-03 20:14:44 +01:00
Carlos Jimenez 48f6f5a18d successfully moved all specs from services/client/c../m../client alongside their respective js files 2018-02-02 16:24:22 +01:00
Carlos Jimenez 7a04327655 removed login warm up to speed up about 20 secs the e2e executiom 2018-02-02 13:04:59 +01:00