Commit Graph

1832 Commits

Author SHA1 Message Date
Daniel Herrero ca03005e10 test fixed 2018-02-14 14:05:02 +01:00
Daniel Herrero 21cc4e3320 semantic refactor 2018-02-14 14:04:47 +01:00
Daniel Herrero 4aa2d2a255 remove obsolete package 2018-02-14 14:03:46 +01:00
SAMBA\bernat 3cb13d3ed7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-14 12:57:56 +01:00
Juan Ferrer Toribio 87dfa49692 Bugs with webpack assets solved 2018-02-14 12:52:24 +01:00
SAMBA\bernat e79beaa13f Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-14 12:09:50 +01:00
Juan Ferrer Toribio cb92e48eef Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-14 11:46:20 +01:00
Juan Ferrer Toribio f18b875ae6 E2E partially fixed 2018-02-14 11:46:07 +01:00
Javi Gallego 225508dd07 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-14 11:34:47 +01:00
Javi Gallego aadf763e76 refactor html 2018-02-14 11:33:21 +01:00
Daniel Herrero a4341b3682 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-14 11:21:23 +01:00
Daniel Herrero 9c9015a197 zoomImage test fixed 2018-02-14 11:21:14 +01:00
Javi Gallego 8130b35434 Tarea #62 abre foto en otra pestaña 2018-02-14 10:56:41 +01:00
Javi Gallego 48f0554a6a Tarea #62 link a la foto 2018-02-14 10:06:51 +01:00
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