Commit Graph

22126 Commits

Author SHA1 Message Date
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
Daniel Herrero 061ae64c50 production filtering in temporary table 2017-11-08 13:42:33 +01:00
Vicente Falco a82de78040 docker compose 2017-11-08 10:54:59 +01:00
Vicente Falco 0a107ba0bc docker 2017-11-08 09:57:51 +01:00
Vicente Falco 97da7e5c10 merge 2017-11-08 07:08:34 +01:00
Vicente Falco 24bb788177 jenkinsfile 2017-11-07 19:59:44 +01:00
Vicente Falco b1f17349c3 Docker changes 2017-11-07 19:21:11 +01:00
vicentefalco 95178c1d23 Jenkinsfile 2017-11-07 16:44:46 +01:00
Vicente Falco a134ecf5cf Jenkins 2017-11-07 14:55:22 +01:00
Vicente Falco f387a4a8ff merge 2017-11-07 14:25:12 +01:00
Carlos 6bfd8dfce6 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  Jenkins
2017-11-07 14:20:09 +01:00
Carlos 821f90d01e commit e2e refactor 2017-11-07 14:19:59 +01:00
Vicente Falco b87cd27ce2 Jenkins 2017-11-07 13:54:19 +01:00
Vicente Falco e9aa15bbe1 Jenkins 2017-11-07 13:36:13 +01:00
Vicente Falco 2a6e707ae3 Jenkins 2017-11-07 13:04:14 +01:00
Vicente Falco ffed7dc666 Jenkins 2017-11-07 12:23:01 +01:00
Vicente Falco 2e141f062b merge 2017-11-07 12:19:58 +01:00
Vicente Falco 17e9116b58 Jenkins 2017-11-07 12:19:30 +01:00
Daniel Herrero ec0eb7f1d1 test fixed 2017-11-07 11:43:18 +01:00
Daniel Herrero 5a1aca198b localizador rutas maquetacion 90% 2017-11-07 11:22:33 +01:00
Daniel Herrero ed3ee81292 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-07 10:00:32 +01:00
Daniel Herrero 7f3df756c8 continuacion con la maquetacion del localizador de rutas 2017-11-07 09:59:49 +01:00
Carlos 5a81fabc65 fake commit 2017-11-07 09:44:58 +01:00
Vicente Falco 348193074e merge 2017-11-07 09:16:03 +01:00
Vicente Falco 56b43fc16d Jenkins 2017-11-07 09:15:44 +01:00
Carlos 30145c14d0 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  route: delete gesdoc
2017-11-07 09:10:08 +01:00
Carlos d4996ac363 e2e big refactor on selectors 2017-11-07 09:09:59 +01:00
Vicente Falco 623b24b48f merge 2017-11-07 08:47:26 +01:00
Vicente Falco 8bb43edcfc route: delete gesdoc 2017-11-07 08:47:12 +01:00
Carlos 736d4f804e Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  service Production: bugs
2017-11-06 14:56:39 +01:00
Vicente Falco be6e33acd2 merge 2017-11-06 13:48:59 +01:00
Carlos 52a325798d e2e small refactor 2017-11-06 10:46:32 +01:00
Carlos 69fbda397d e2e test for edit discal data path invoice checkbox 2017-11-03 18:32:58 +01:00
Carlos ced9739150 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  tabla localizador de rutas maquetada
  structure module locator
  new icon-menu
  new module locator
  enlaces pp en modulos cliente y rutas
  error con checkboxes y su anchura
  sprint3 pantallas de rutas
  refactor dataPicker
  bug fixed in dataPicker
  route basic data structure
2017-11-03 17:59:07 +01:00
Vicente Falco fd1c174453 merge 2017-11-03 07:05:05 +01:00
Vicente Falco 9c1086bd4c merge 2017-11-03 07:04:38 +01:00
Daniel Herrero ae2ecb6d73 tabla localizador de rutas maquetada 2017-11-02 14:57:36 +01:00
Daniel Herrero f0b4e1ff71 structure module locator 2017-11-02 14:10:28 +01:00
Daniel Herrero 4f840c71e3 new icon-menu 2017-11-02 13:27:35 +01:00
Vicente Falco 74e2b2b04d merge 2017-11-02 13:09:59 +01:00
Daniel Herrero 93661fe8e3 new module locator 2017-11-02 11:13:20 +01:00
Daniel Herrero 3d9c46f08e enlaces pp en modulos cliente y rutas 2017-11-02 09:58:28 +01:00