Commit Graph

4719 Commits

Author SHA1 Message Date
Gerard 53891336a6 Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
2019-02-20 11:42:23 +01:00
Gerard 5d6951a610 deleted deprecated component
gitea/salix/dev There was a failure building this commit Details
2019-02-20 11:41:06 +01:00
Gerard efff9d2184 deleted duplicated data
gitea/salix/dev This commit looks good Details
2019-02-20 11:36:55 +01:00
Gerard 0f5d1e55c0 item descriptor not sending the correct warehouse fixed
gitea/salix/dev This commit looks good Details
2019-02-20 11:30:55 +01:00
Joan Sanchez f793ec93df Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
2019-02-20 10:07:40 +01:00
Joan Sanchez 20843a9068 updated module worker acl, removed fi from summary
gitea/salix/dev This commit looks good Details
2019-02-20 09:59:39 +01:00
Joan Sanchez 6b4fbb180a fixed print styles
gitea/salix/dev This commit looks good Details
2019-02-20 09:29:14 +01:00
Joan Sanchez 40d765adc1 removed fi from worker module
gitea/salix/dev This commit looks good Details
2019-02-20 09:16:19 +01:00
Gerard 3e2dd9cd3a Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
2019-02-20 09:00:40 +01:00
Joan Sanchez 031aeae950 fixed styles
gitea/salix/dev This commit has test failures Details
2019-02-20 08:57:51 +01:00
Gerard e3e9998243 Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
2019-02-20 08:35:15 +01:00
Gerard 419778f67e now has the proper title directive
gitea/salix/dev This commit looks good Details
2019-02-20 08:26:53 +01:00
Gerard d22a69f546 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-02-20 08:24:24 +01:00
Gerard c8623ef3da e2e now changes the agency 2019-02-20 08:24:10 +01:00
Joan Sanchez a33a63f866 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-02-20 07:32:10 +01:00
Joan Sanchez 0a45760251 removed duplicated empty-rows 2019-02-20 07:30:40 +01:00
Carlos Jimenez Ruiz 250bb359e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-02-19 18:00:07 +01:00
Carlos Jimenez Ruiz 7d2bc25c95 #1142 order.line total 2019-02-19 17:55:19 +01:00
Gerard de5a15778e e2e fixed
gitea/salix/dev This commit looks good Details
2019-02-19 16:37:17 +01:00
Gerard 927957aed8 Merge remote-tracking branch 'upstream/dev' into jgallego 2019-02-19 16:12:01 +01:00
Gerard e041cef586 vn-empty-rows deleted as its not longer needed 2019-02-19 16:11:57 +01:00
Gerard a8a17b72bd Merge remote-tracking branch 'origin/dev' into jgallego 2019-02-19 16:10:16 +01:00
Gerard 9d39840449 performance problems with the component fetched tags fixed
gitea/salix/dev This commit looks good Details
2019-02-19 15:54:01 +01:00
Joan Sanchez d11a51b3f1 added color filter #1041
gitea/salix/dev This commit looks good Details
2019-02-19 15:13:27 +01:00
Gerard b7db5f969b fixed worker descriptor not showing the correct worker
gitea/salix/dev This commit looks good Details
2019-02-19 15:09:50 +01:00
Gerard 2121b87895 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-19 15:06:53 +01:00
Juan Ferrer 9108e0af52 Jenkinsfile fixes
gitea/salix/dev This commit looks good Details
2019-02-19 13:25:17 +01:00
Gerard 5ef524559e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-19 12:59:58 +01:00
Gerard abfbf791f3 added one time bindings 2019-02-19 12:50:24 +01:00
Carlos Jimenez Ruiz acc324c081 excluded tests for task #1152
gitea/salix/dev This commit looks good Details
2019-02-19 12:28:39 +01:00
Carlos Jimenez Ruiz ff415dc654 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-19 12:14:27 +01:00
Gerard Miguel 12337d6bcf Merge branch 'test' of gerard/salix into dev
gitea/salix/dev This commit looks good Details
2019-02-19 10:42:40 +00:00
Gerard Miguel 14853f09cf Merge branch 'test' of gerard/salix into test
gitea/salix/test This commit looks good Details
2019-02-19 10:31:53 +00:00
Gerard 280803f2ad tests updated
gitea/salix/PR-11 This commit looks good Details
gitea/salix/PR-12 This commit looks good Details
2019-02-19 11:17:08 +01:00
Carlos Jimenez Ruiz 1f2d38f638 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-19 10:57:44 +01:00
Gerard 054cf21c1f item index fixes
gitea/salix/PR-10 This commit has test failures Details
2019-02-19 10:15:39 +01:00
Juan Ferrer 0580500359 Style fixes
gitea/salix/dev This commit looks good Details
2019-02-19 09:40:36 +01:00
Javi Gallego a0cf617cca #498 e2e arreglado
gitea/salix/jgallego This commit looks good Details
2019-02-19 08:42:36 +01:00
Carlos Jimenez Ruiz 2d2ce304b5 merge 2019-02-19 08:16:36 +01:00
Joan Sanchez 4645e75f17 check fdescribe removed
gitea/salix/dev This commit looks good Details
2019-02-19 07:05:39 +01:00
Joan Sanchez 79e8c1b19a checkbox front unit test
gitea/salix/dev This commit looks good Details
2019-02-19 07:04:56 +01:00
Gerard e85c346f45 #1102 scope en el modelo company
gitea/salix/dev This commit looks good Details
2019-02-18 14:46:25 +01:00
Gerard 3101020220 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-02-18 14:40:55 +01:00
Gerard cc69099b37 #1102 scope en el modelo company 2019-02-18 14:40:50 +01:00
Joan Sanchez 75053618a2 zoneLocation order
gitea/salix/dev This commit looks good Details
2019-02-18 13:39:48 +01:00
Joan Sanchez 813d7368f3 fixed zoneLocation order 2019-02-18 13:37:36 +01:00
Javi Gallego da4d961c8b Merge branch 'dev' into jgallego
gitea/salix/jgallego This commit has test failures Details
2019-02-18 13:35:33 +01:00
Javi Gallego a3e69d604a getAvailable aislado 2019-02-18 13:31:57 +01:00
Joan Sanchez 0ea161ff19 fixed zoneLocation search
gitea/salix/dev This commit looks good Details
2019-02-18 13:23:24 +01:00
Gerard eccd83aac0 nodemon now watches json changes
gitea/salix/dev This commit looks good Details
2019-02-18 12:55:22 +01:00