Commit Graph

25517 Commits

Author SHA1 Message Date
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
Carlos 297c0afe76 encoding bug corrected 2017-11-09 09:27:27 +01:00
Carlos 792bf6ce66 encoding UTF-8 2017-11-09 09:25:26 +01:00
Carlos 481792f8bd Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  removed eslint errors
  refact production list
  microservices: configuration
  microservices: boot
  Production Package
  Client: Request Package
  Jenkinsfile
  docker context
  Docker auth
  Docker loopback
  Error JenkinsFile
  Docker: Faster
  Docker
2017-11-09 09:04:28 +01:00
Carlos bc43d5c3c4 refactor on e2e selectors and discal data spec 2017-11-09 09:03:41 +01:00
Daniel Herrero 3d33c21cc8 removed eslint errors 2017-11-09 08:59:40 +01:00
Daniel Herrero d2491bfbf4 refact production list 2017-11-09 08:54:41 +01:00
Vicente Falco 10c52a75b9 microservices: configuration 2017-11-09 07:45:46 +01:00
Vicente Falco 14820fbb3e merge 2017-11-09 07:34:17 +01:00
Vicente Falco 20a6728ed6 microservices: boot 2017-11-09 07:34:02 +01:00
Vicente Falco a9cab91acc Production Package 2017-11-08 20:06:00 +01:00
Vicente Falco 9cddb00a19 Client: Request Package 2017-11-08 18:27:31 +01:00
Vicente Falco 560f41307f Jenkinsfile 2017-11-08 18:01:15 +01:00
Vicente Falco 18121e1d9d docker context 2017-11-08 17:44:10 +01:00
Vicente Falco 2de3ccff8e Docker auth 2017-11-08 17:40:15 +01:00
Vicente Falco c03e5297a2 Docker loopback 2017-11-08 17:24:23 +01:00
Vicente Falco 32a6117d22 Error JenkinsFile 2017-11-08 17:08:09 +01:00
Vicente Falco 254615331a Docker: Faster 2017-11-08 17:04:08 +01:00
Vicente Falco 568c854435 Docker 2017-11-08 16:23:28 +01:00
Carlos f6d9f44df4 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  refact list production
  docker
  production filtering in temporary table
  docker compose
  docker
2017-11-08 15:46:51 +01:00
Carlos bab2ca1e53 extensions.js refactor 2017-11-08 15:46:19 +01:00
Carlos 60a478e5c6 selectors.js refactor plus e2e tests 2017-11-08 15:43:34 +01:00
Daniel Herrero f71dfa53ef refact list production 2017-11-08 14:59:46 +01:00
Vicente Falco 1d109f2371 docker 2017-11-08 14:11:33 +01:00
Daniel Herrero 063b97d3e1 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-08 13:42:41 +01:00