Commit Graph

5431 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 3ab0b2eb19 merge 2019-02-15 12:43:18 +01:00
Carlos Jimenez Ruiz 92a645f395 #1122 + worker descriptor popover + small refactors for worker.nickname 2019-02-15 12:39:21 +01:00
Juan Ferrer 34ace7f5d4 Strict dependency injection enabled 2019-02-15 12:34:21 +01:00
Gerard 4f851c9eed #1111 poder buscar pedidos confirmados o sin confirmar 2019-02-15 11:05:14 +01:00
Gerard 90a4e5a7d1 #1144 fixed bugs with $destroy 2019-02-15 11:03:27 +01:00
Gerard c3903b8d51 added tripleState setter 2019-02-15 08:49:44 +01:00
Joan Sanchez fe2c74c8c8 fixed event emiter 2019-02-15 08:40:18 +01:00
Joan Sanchez e373e603bf checkbox component noew emits change event 2019-02-15 08:02:29 +01:00
Joan Sanchez cf9831473b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-15 06:49:31 +01:00
Gerard db6a5cfc3e changed hide for on-hide binding 2019-02-14 20:18:10 +01:00
Gerard fd0e46516c #1060 añadir al componente check la popiedad intermediate 2019-02-14 20:17:22 +01:00
Joan Sanchez e49512d152 updated fonts 2019-02-14 14:47:05 +01:00
Gerard 1144a197a5 #1112 ticket.sale 2019-02-14 12:06:14 +01:00
Gerard 16f92ce646 changed Type traduction 2019-02-14 12:05:46 +01:00
Gerard f7968ff15b tests fixed 2019-02-14 11:41:06 +01:00
Gerard 9c439e9a92 added category to item search panel 2019-02-14 11:24:04 +01:00
Gerard 2a48e183e9 information added to the table 2019-02-14 09:59:54 +01:00
Juan Ferrer fca040112a Jenkinsfile fixes 2019-02-13 16:26:49 +01:00
Juan Ferrer f3e3c1bbae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-13 14:01:38 +01:00
Juan Ferrer 1f759b6b8c Style fixes 2019-02-13 14:01:37 +01:00
Bernat df452ff345 merge 2019-02-13 13:28:02 +01:00
Bernat bbd4188695 #9848 fix test and update fixtures 2019-02-13 13:19:15 +01:00
Carlos Jimenez Ruiz d38ce05f7d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-13 10:01:04 +01:00
Carlos Jimenez Ruiz 25d8e06c1d updated backend unit test gulp tasks 2019-02-13 10:00:56 +01:00
Gerard b93e2f5359 #1114 item.regularize 2019-02-13 09:49:41 +01:00
Gerard bfaf9b1ed4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-13 09:27:13 +01:00
Gerard 5063bd8137 #1128 item.index 2019-02-13 09:27:11 +01:00
Carlos Jimenez Ruiz 3bd137a435 minor refactor 2019-02-13 08:53:57 +01:00
Carlos Jimenez Ruiz fefd6f45af removed deprecation 2019-02-13 08:43:09 +01:00
Carlos Jimenez Ruiz 8bbf924573 removed deprecated script 2019-02-13 08:35:39 +01:00
Carlos Jimenez Ruiz 7586024422 data base test refactor and fix with app boot 2019-02-13 08:34:40 +01:00
Carlos Jimenez Ruiz fb4a4cd3de Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-13 08:19:44 +01:00
Joan Sanchez 7f96eae312 $applyAsync() with relocate() on catalog. Replaced $$postDigest() #1072 2019-02-13 07:57:08 +01:00
Gerard 8fa7abe191 #1128 User view directive first version 2019-02-12 17:24:37 +01:00
Juan Ferrer d65a6fd59e Ticket summary fix: lines with no claim 2019-02-12 15:39:37 +01:00
Carlos Jimenez Ruiz 06db624fd6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-12 15:07:43 +01:00
Gerard 4287457692 fixed translate in tables 2019-02-12 14:57:40 +01:00
Carlos Jimenez Ruiz 3a5b5096da Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-12 14:40:22 +01:00
Carlos Jimenez Ruiz 9c0613e8e7 #1127 2019-02-12 14:40:13 +01:00
Gerard 5b50bbd5d0 Merge branch 'test' into dev 2019-02-12 14:36:24 +01:00
Gerard 208936f979 Merge branch 'master' into test 2019-02-12 14:29:45 +01:00
Gerard 41d950eaef hotfix errors creting tickets 2019-02-12 14:23:04 +01:00
Carlos Jimenez Ruiz 8ef6db9017 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-12 13:33:21 +01:00
Joan Sanchez 108d9d4044 calculate swift on load #1132 2019-02-12 13:26:52 +01:00
Juan Ferrer 8aa0497524 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-12 09:24:30 +01:00
Juan Ferrer a21ce7fba1 Fix 2019-02-12 09:24:20 +01:00
Carlos Jimenez Ruiz b0e22febd3 #1127 mover ticket.descriptor al modulo ticket 2019-02-12 09:03:56 +01:00
Joan Sanchez 604f75c84b Show/send claim pickup order #1106 2019-02-12 07:42:19 +01:00
Juan Ferrer 5dfb6bc22f Gulp fixes 2019-02-12 00:44:39 +01:00
Juan Ferrer 4d0495fce7 Gulp logging improved 2019-02-12 00:39:39 +01:00