Commit Graph

1668 Commits

Author SHA1 Message Date
Juan Ferrer Toribio e4595da2a7 E2E test partially fixed 2018-02-14 10:03:00 +01:00
Daniel Herrero 20506bdc59 re-refactor zoomImage 2018-02-14 09:25:41 +01:00
Daniel Herrero 087b1d9a61 refactor zoomImage 2018-02-14 09:21:43 +01:00
SAMBA\bernat 166d43c561 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-14 07:08:44 +01:00
Juan Ferrer Toribio fd0d5b70be Solved bug that caused main webpack assets incorrecly cached by browsers (Deployment should be tested) 2018-02-13 23:01:28 +01:00
Juan Ferrer Toribio 8bc61ffc5a Minimal documentation changes. 2018-02-13 22:45:30 +01:00
Juan Ferrer Toribio 8be4e0fb1f Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-13 22:40:17 +01:00
Juan Ferrer Toribio 72830652b4 Documented Gulpfile, improved 'docker-wait' to handle errors 2018-02-13 22:40:02 +01:00
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
Daniel Herrero 5565b7daa4 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-13 13:15:17 +01:00
Daniel Herrero d964f7efaa SPR1.3 TASK#36 - zoom image 2018-02-13 13:15:03 +01:00
Carlos Jimenez c99f22430b mini refactor filter panel 2018-02-13 11:41:39 +01:00
SAMBA\bernat 8c9ee4f6bc Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-13 09:51:25 +01:00
Carlos Jimenez 0bcc638af7 mini refactor on address edit 2018-02-13 09:32:07 +01:00
SAMBA\bernat 76cb3a4842 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-13 08:06:43 +01:00
Carlos Jimenez 88b3e3a6c5 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-12 13:20:48 +01:00
Carlos Jimenez f7f1a733c6 e2e path for add adress notes files - pending to finish 2018-02-12 13:19:54 +01:00
Juan Ferrer Toribio 4c76718bce Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-12 13:17:00 +01:00
Juan Ferrer Toribio c4b184e5e8 vnCheck componentized, Client style changes 2018-02-12 13:16:49 +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
SAMBA\bernat 7f08796828 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-12 08:10:50 +01:00
Juan Ferrer Toribio 88d50e3d00 Core refactor, first step 2018-02-10 16:18:01 +01:00
Juan Ferrer Toribio 8852bfd4bb Bug solved: Modules are not loaded when language is not recognized 2018-02-10 11:41:29 +01:00
Juan Ferrer Toribio b45ab59076 Updated template datasources.json 2018-02-09 15:10:33 +01:00
SAMBA\bernat b2edcaf472 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-09 14:45:29 +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 e1a565ae1f Merge branch 'dev' of https://git.verdnatura.es:/salix into test 2018-02-09 12:27:32 +01:00
Vicente Falco 58d5e7add9 Services Jenkins 2018-02-09 12:26:27 +01:00
Juan Ferrer Toribio 6af6ca9c34 Merge 2018-02-09 09:12:22 +01:00
Carlos Jimenez 540a65476b fixtures updated 2018-02-09 08:54:53 +01:00
Juan Ferrer Toribio a84c6f6de7 Merge branch 'unstable' of https://git.verdnatura.es/salix into unstable 2018-02-09 08:40:28 +01:00
Juan Ferrer Toribio 7b7ee2662f Gulpfile: known bugs solved, performance improbements 2018-02-09 08:40:23 +01:00
Carlos Jimenez 861ed0e78f Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-08 14:53:12 +01:00
Carlos Jimenez 32cd96b443 item history now shows descriptions acction changed by and date order or collumns 2018-02-08 14:52:24 +01:00
Daniel Herrero 1ccf108ddc packageLock 2018-02-08 14:45:39 +01:00
Daniel Herrero 2fe4245ea5 packages version 2018-02-08 14:41:05 +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
Juan Ferrer Toribio fd14e29884 Webpack 3 2018-02-08 13:47:54 +01:00
Daniel Herrero 5ac17fe8de Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-08 13:28:12 +01:00
Daniel Herrero 6387f6cedb noteCreate fixed 2018-02-08 13:28:01 +01:00
Juan Ferrer Toribio 156eb61be5 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-08 13:13:50 +01:00
Juan Ferrer Toribio f7ea8e6435 watcher lint 2018-02-08 13:13:42 +01:00
Vicente Falco 725fe79022 package md5 2018-02-08 13:11:15 +01:00
Vicente Falco f8dd52bd99 merge 2018-02-08 13:06:36 +01:00
Vicente Falco d6b010387a service auth package md5 2018-02-08 13:06:12 +01:00