Commit Graph

3891 Commits

Author SHA1 Message Date
Vicente Falco 2329139db0 Docker 2017-11-15 18:25:59 +01:00
Daniel Herrero dfb5552181 new Favicon 2017-11-15 14:39:46 +01:00
Daniel Herrero 11da1dad8d locator, production and route modules only to developer acl 2017-11-15 13:16:40 +01:00
Daniel Herrero e071fbb926 changes acls to merge with test 2017-11-15 13:13:51 +01:00
Daniel Herrero 31a22cf4e3 Merge branch 'dev' 2017-11-15 13:12:01 +01:00
Daniel Herrero dd14ddb8bd production only acl to developers 2017-11-15 13:11:04 +01:00
Daniel Herrero d5d8145fee bugs fixed 2017-11-15 13:05:11 +01:00
Daniel Herrero 44dde2b705 searchbar clean filters 2017-11-15 12:53:32 +01:00
Daniel Herrero d4a0cf205d bug fixed in edit addresses 2017-11-15 12:11:35 +01:00
Daniel Herrero bb4c43c2bd cambios en formularios de client 2017-11-15 09:38:39 +01:00
Daniel Herrero 78fd0d4d16 recargo y vies movidos de vista 2017-11-15 08:41:54 +01:00
Daniel Herrero 70328e6759 Merge branch 'dev' 2017-11-15 07:13:51 +01:00
Daniel Herrero dce3ae7520 created storage services 2017-11-15 07:12:52 +01:00
Daniel Herrero d19ebe0c8c bug fixed list producction 2017-11-14 11:20:12 +01:00
Carlos 2bb87dc195 unit test for autocomplete - tested filterSearch functionality 2017-11-14 11:05:40 +01:00
Daniel Herrero 83965b20ee Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-14 08:56:28 +01:00
Daniel Herrero a84fc8c1b6 new autoComplete option to custom filter 2017-11-14 08:45:56 +01:00
Carlos 77ccc0e8af temp favicon.ico (to update once we have the right one) 2017-11-14 08:24:01 +01:00
Carlos 29149b1b58 corrected some eslint errors and small refactor 2017-11-13 22:15:44 +01:00
Carlos ed64c3b50a vn icon css changes for main menu 2017-11-13 14:17:09 +01:00
Carlos 154c06e7f4 added hasToInvoiceByAddress checkbox to client > billingData 2017-11-13 11:47:41 +01:00
Carlos c800034cc7 e2e testing fiscal data path up to country select 2017-11-13 08:36:15 +01:00
Carlos 7c37ded182 Merge branch 'dev' of https://git.verdnatura.es/salix 2017-11-09 14:52:16 +01:00
Carlos 602d0a74bd e2e test 2017-11-09 14:47:09 +01:00
Daniel Herrero 6ea0f05054 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-09 14:27:23 +01:00
Daniel Herrero 17143883f8 address data changes 2017-11-09 14:27:01 +01:00
Carlos be45258b4c Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  Jenkins error
  Jenkinsfile
2017-11-09 13:54:25 +01:00
Carlos 7223922251 typo corrected at dblocal fixtures plus renamed files and selectors added 2017-11-09 13:54:06 +01:00
Vicente Falco 8c3a5a7f6e Jenkins error 2017-11-09 13:45:26 +01:00
Vicente Falco faecb9aa3b merge 2017-11-09 13:44:24 +01:00
Vicente Falco 83e4a3c873 Jenkinsfile 2017-11-09 13:44:06 +01:00
Carlos 8ca4a9b9d7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  Jenkins
2017-11-09 13:30:03 +01:00
Carlos f1eba5d27c translation refactor for fiscal data 2017-11-09 13:29:51 +01:00
Vicente Falco 7d5b421ace merge 2017-11-09 13:24:39 +01:00
Vicente Falco 3fd3f61492 Jenkins 2017-11-09 13:24:23 +01:00
Daniel Herrero b77395762c bug fixed in address 2017-11-09 13:22:54 +01:00
Daniel Herrero 563c49b785 disable all module routes if not permission 2017-11-09 12:51:46 +01:00
Carlos 9d67a622fc Merge branch 'dev' of https://git.verdnatura.es/salix 2017-11-09 11:43:06 +01:00
Daniel Herrero 5c8e997738 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-09 11:39:53 +01:00
Daniel Herrero c74bafae7e acl in routes 2017-11-09 11:39:41 +01:00
Carlos f03f17723f one more character correction due to encoding 2017-11-09 11:00:59 +01:00
Carlos 6fd171e11f file encoding changed to UTF-8 2017-11-09 10:57:44 +01:00
Daniel Herrero 865d106d4f bug fixed in autocomplete 2017-11-09 10:11:59 +01:00
Carlos 2103b1f3a3 encoding characters updated 2017-11-09 10:10:35 +01:00
Carlos eae7a60950 encoding changes 2017-11-09 10:09:27 +01:00
Carlos a5fe183302 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  Docker
2017-11-09 09:50:10 +01:00
Carlos 086f3666c9 correcting encoding bug 2017-11-09 09:49:45 +01:00
Vicente Falco 81f108fb9a merge 2017-11-09 09:41:32 +01:00
Carlos 8763b24416 renamed files with encoding conflicts 2017-11-09 09:41:05 +01:00
Vicente Falco df07e7060f Docker 2017-11-09 09:39:32 +01:00