Commit Graph

592 Commits

Author SHA1 Message Date
Javi Gallego 595cbfbed6 quitado el antiguo campo de iva 2018-02-13 14:19:06 +01:00
Javi Gallego a50c3d565e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-13 13:29:28 +01:00
Javi Gallego b5db0abbf1 Creacion sin relevancy y acl de clientObservation 2018-02-12 12:02:00 +01:00
Carlos Jimenez 813e160499 pagination for item log plus more fixtures 2018-02-12 12:01:39 +01:00
Carlos Jimenez 845dfc77bb Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-12 10:53:43 +01:00
Carlos Jimenez 100b5a09ed fixtures for item log 2018-02-12 10:53:03 +01:00
Juan Ferrer Toribio b45ab59076 Updated template datasources.json 2018-02-09 15:10:33 +01:00
Juan Ferrer Toribio f79b70e264 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-09 12:43:17 +01:00
Juan Ferrer Toribio d369db9dc0 Debug fixes 2018-02-09 12:43:14 +01:00
Vicente Falco 58d5e7add9 Services Jenkins 2018-02-09 12:26:27 +01:00
Carlos Jimenez 540a65476b fixtures updated 2018-02-09 08:54:53 +01:00
Carlos Jimenez e11e0be029 fixtures for addresses listed for Bruce Banner are now enough to trigger pagination 2018-02-08 14:40:32 +01:00
Vicente Falco 725fe79022 package md5 2018-02-08 13:11:15 +01:00
Vicente Falco d6b010387a service auth package md5 2018-02-08 13:06:12 +01:00
Daniel Herrero 4ec0a3c46d item history 2018-02-08 12:04:33 +01:00
Carlos Jimenez 76f808e7f6 itemLog for item history refactor 2018-02-08 11:40:06 +01:00
Javi Gallego 378c04b123 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-08 09:44:32 +01:00
Vicente Falco 6011a2ecaf Docker 2018-02-08 08:30:24 +01:00
Vicente Falco bf7a286b1c Dockerfile 2018-02-08 07:15:25 +01:00
Juan Ferrer Toribio 45606303fe Script to import local-db changes, fixtures fixed, structure updated 2018-02-07 19:55:47 +01:00
Juan Ferrer Toribio f84bf44550 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-07 16:45:50 +01:00
Juan Ferrer Toribio 4876f36190 Local database structure updated & import changes script 2018-02-07 16:45:40 +01:00
Carlos Jimenez 03faa09284 item history functionality, awaiting for clientfilters refactor 2018-02-07 15:06:21 +01:00
SAMBA\bernat 249a622e2d update fixtures 2018-02-07 14:45:04 +01:00
Vicente Falco c61748ec95 Dockerfile Services 2018-02-07 14:37:26 +01:00
Javi Gallego 220baa717e roles de credito y greuges 2018-02-07 14:16:11 +01:00
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
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
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
Juan Ferrer Toribio 65e197d555 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-06 09:10:57 +01:00
Daniel Herrero f0356eb047 join addressObservation into list Addresses service 2018-02-06 07:59:36 +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 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 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