Commit Graph

4174 Commits

Author SHA1 Message Date
Carlos Jimenez cacfa3988e Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-25 14:37:03 +02:00
Carlos Jimenez e953d04d80 #750 configurar reglas de eslint para todos los equipos del proyecto 2018-10-25 14:36:50 +02:00
Joan Sanchez d011b93a63 fieldAcl in production 2018-10-25 14:34:17 +02:00
Carlos Jimenez faa7ca154a Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-25 14:09:40 +02:00
Carlos Jimenez dd41733771 indentation and unused script removed 2018-10-25 14:09:32 +02:00
Gerard ad8f3f9b9d #761 no se actualizan los cuando se abren varios summary-popover 2018-10-25 13:45:29 +02:00
Joan Sanchez c73ce0a08a eslint sourceType 2018-10-25 13:26:39 +02:00
Joan Sanchez 7e31a83f52 Merge branch 'test' into dev 2018-10-25 13:04:59 +02:00
Joan Sanchez 145469126b package dependency 2018-10-25 12:16:55 +02:00
Gerard 8982819f7c #752 changeState.spec.js repairs 2018-10-25 11:50:18 +02:00
Gerard 4ff31fe930 #754 listSaleTracking.spec.js repairs 2018-10-25 11:49:38 +02:00
Joan Sanchez 5e086d45eb install dependencies 2018-10-25 11:38:21 +02:00
Joan Sanchez c2ab736281 docker compose node tool 2018-10-25 11:03:35 +02:00
Gerard 3eef3b05ce Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-25 10:54:23 +02:00
Gerard 47a9ec6101 #758 no se muestran Base, Margen y Total en ticket components 2018-10-25 10:54:16 +02:00
Joan Sanchez 269a7db38a build from dockerfile 2018-10-25 10:51:47 +02:00
Joan Sanchez 9cfb6db440 docker build 2018-10-25 10:37:42 +02:00
Bernat 1c81fa55ab export structure and data from production 2018-10-25 09:41:58 +02:00
Joan Sanchez e671e20c9b docker build 2018-10-25 09:13:35 +02:00
Carlos Jimenez a8aeaab97d removed fdescribe 2018-10-25 09:04:41 +02:00
Carlos Jimenez 2a2ba7a9f0 refactor e2e a async await 2018-10-25 09:03:43 +02:00
Carlos Jimenez 3bcca3b39d #750 subida version de eslint, y configs de angular, google, loopback,xo 2018-10-25 09:03:12 +02:00
Joan Sanchez 75f6004b2c docker 2018-10-25 08:53:58 +02:00
Joan Sanchez 7c3f90e7c2 docker 2018-10-25 08:06:29 +02:00
Joan Sanchez a57c8a6575 docker 2018-10-25 07:57:17 +02:00
Joan Sanchez 56322ca520 docker tool 2018-10-25 07:39:40 +02:00
Joan Sanchez 8ebabfd0f8 docker tool 2018-10-25 07:29:16 +02:00
Carlos Jimenez 06681fa5f4 minimal changes 2018-10-24 16:06:18 +02:00
Joan Sanchez f8d11c01b8 install gulp globally 2018-10-24 14:59:49 +02:00
Joan Sanchez 6493b05f2b nodejs 2018-10-24 14:41:38 +02:00
Joan Sanchez 78bda2c795 nodejs tool 2018-10-24 14:40:18 +02:00
Gerard 3851e4a889 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-24 14:21:39 +02:00
Gerard e491b2e4ba fixed local bank being null on init 2018-10-24 14:21:35 +02:00
Javi Gallego 5532dedcc3 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-24 14:11:28 +02:00
Javi Gallego 3b2466e121 Tarea #703 client.risk.new 2018-10-24 14:10:48 +02:00
Joan Sanchez e7ead4be1c nodejs tool 2018-10-24 14:10:41 +02:00
Carlos Jimenez 7a6b2f19d3 #753 order - removes.spec.js repairs + refactors 2018-10-24 14:10:08 +02:00
Carlos Jimenez 443d6ec08a Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-24 13:46:10 +02:00
Carlos Jimenez f4add0942c #751 removes.spec.js repairs 2018-10-24 13:45:59 +02:00
Joan Sanchez 001ca835ee reverted 2018-10-24 13:26:20 +02:00
Joan Sanchez ce464bcc12 node 2018-10-24 13:15:59 +02:00
Gerard c77f77132c fixed typos and tests 2018-10-24 13:03:44 +02:00
Gerard ed80915120 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-24 12:28:40 +02:00
Gerard 5b78457129 bugs tying to set local company null solved 2018-10-24 12:28:33 +02:00
Carlos Jimenez 4ff2d0e6d3 back end unit test maintenance 2018-10-24 11:56:15 +02:00
Joan Sanchez cfce912164 nodejs 2018-10-24 11:16:08 +02:00
Joan Sanchez bc0f8ef59e jenkins config node tool 2018-10-24 11:14:10 +02:00
Carlos Jimenez 784f00c860 #737 Modificar E2E billing data + version de nightmare 2018-10-24 10:57:14 +02:00
Gerard af508b664c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-24 09:31:11 +02:00
Gerard 1e9bd88830 #748 el popover de congifuracion de usuario debe setear unas propedades por defecto 2018-10-24 09:31:08 +02:00