Commit Graph

4396 Commits

Author SHA1 Message Date
Gerard da792a227c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-29 15:59:58 +01:00
Gerard c9c2f139d5 css fixed 2018-10-29 15:59:52 +01:00
Carlos Jimenez b9ae168b6e eslint prime config 2018-10-29 15:46:14 +01:00
Carlos Jimenez 620ec1f08e Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-29 12:57:18 +01:00
Carlos Jimenez 4d261a8fd9 temporary eslint modification 2018-10-29 12:57:08 +01:00
Gerard eb2e872faf Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-29 12:48:41 +01:00
Gerard 3a0aa9da8e #769 fixed user filter 2018-10-29 12:48:25 +01:00
Bernat e03332bc5c refactor e2e 2018-10-29 12:35:25 +01:00
Gerard 20de81a3c8 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-29 11:57:02 +01:00
Gerard 5ef3820912 #769 crear sección log en item y ticket 2018-10-29 11:56:55 +01:00
Bernat b0c8ac7062 update acl 2018-10-29 11:53:32 +01:00
Bernat 5480c5bdbf update structure table logs 2018-10-29 11:35:17 +01:00
Carlos Jimenez ba778d5d31 #774 Arreglar e2e de ticket expeditions 2018-10-29 11:07:48 +01:00
Carlos Jimenez 5423744489 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-29 10:42:52 +01:00
Carlos Jimenez a8355ff455 #756 ticket.sale-tracking scss fixes 2018-10-29 10:42:43 +01:00
Gerard 36f048e4ef Bug #772 Ticket expeditions ha dejado de funcionar 2018-10-29 09:39:37 +01:00
Carlos Jimenez 44da0312e6 #772 Ticket expeditions ha dejado de funcionar e2e selectors 2018-10-29 09:22:10 +01:00
Carlos Jimenez 545c6ef307 #772 Ticket expeditions ha dejado de funcionar e2e 2018-10-29 09:21:33 +01:00
Carlos Jimenez 53fe9b6103 #756 ticket.sale-tracking checking state functionality 2018-10-29 08:33:53 +01:00
Carlos Jimenez 0a0e3d6c1e #763 e2e en item index (summary) 2018-10-28 12:37:37 +01:00
Carlos Jimenez 2a9dd98e6a #756 ticket.sale-tracking 2018-10-28 12:36:41 +01:00
Carlos Jimenez 11787ec2e1 #759 e2e ticket component 2018-10-25 16:44:03 +02:00
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