Commit Graph

22316 Commits

Author SHA1 Message Date
Joan Sanchez e698d84a4f crud-model refactor. crud-model fixes #409 2018-08-30 08:50:03 +02:00
Carlos Jimenez a1b87e473e removed unused code 2018-08-30 08:17:05 +02:00
Carlos Jimenez 8d79298d92 #478 dialog Front unit test 2018-08-30 08:16:50 +02:00
Joan Sanchez bd38d07af4 front-end unit test fixed 2018-08-30 07:15:04 +02:00
Joan Sanchez 3c954f13f3 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-30 07:09:09 +02:00
Joan Sanchez 3594d5df4c back-end test fix 2018-08-30 07:09:06 +02:00
gerard 3c675b99a0 bug with clear solved CR JOAN 2018-08-29 13:55:47 +02:00
gerard 52291dee68 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-29 12:44:15 +02:00
gerard 7853236f2b resolved bug with alert level nonexistent 2018-08-29 12:43:44 +02:00
Carlos Jimenez 08ef7dee96 #444 style amends 2018-08-29 11:43:25 +02:00
Carlos Jimenez aff9f57833 #444 claim basic data 2018-08-29 09:45:37 +02:00
Carlos Jimenez b9cd86af11 traducciones 2018-08-29 08:29:54 +02:00
Carlos Jimenez 1b51ab7e6d refactor CR Joan 2018-08-29 08:15:49 +02:00
Carlos Jimenez 5d6a8f773c refactor CR Gerard 2018-08-29 08:15:23 +02:00
Carlos Jimenez 072581a0fe refactor CR Joan 2018-08-29 08:14:18 +02:00
Carlos Jimenez cad4f1617a lint errors corrected 2018-08-29 08:13:54 +02:00
Joan Sanchez 2e8f8109e7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-27 15:12:04 +02:00
Joan Sanchez 1d14ca1a3f updated contacts 2018-08-27 15:11:57 +02:00
gerard 740cc9f626 Bug #590 estructura basica de claim 2018-08-27 11:48:37 +02:00
gerard 5c60ba1336 Bug #590 estructura basica de claim 2018-08-27 11:41:25 +02:00
gerard 0566dd5328 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-27 11:40:14 +02:00
Joan Sanchez 26d2054be1 removed focus 2018-08-27 11:27:32 +02:00
Joan Sanchez bf61bc86d4 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-27 11:23:01 +02:00
Joan Sanchez 1c17adcd25 refactor client contact 2018-08-27 11:22:59 +02:00
gerard cc3c1c9b55 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-27 09:17:11 +02:00
Juan c37dc6179e Now dockers are started automatically on system boot or daemon restart 2018-08-26 14:36:51 +02:00
gerard e92ae60792 Bug #590 estructura basica de claim 2018-08-24 13:16:11 +02:00
Joan Sanchez 8f45888a6b Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-23 14:11:00 +02:00
Joan Sanchez de4d9c5bab input-range 2018-08-23 14:10:54 +02:00
Carlos Jimenez c2f89e7089 #482 popover.js Front unit test 2018-08-23 13:53:29 +02:00
gerard 67afda853c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-23 12:31:14 +02:00
gerard b558d79757 Tarea #551 /workerMana/getCurrentWorkerMana.js 2018-08-23 12:31:04 +02:00
Joan Sanchez d39ef8827f fixed ticket filter back-end test 2018-08-23 10:48:44 +02:00
Joan Sanchez c7ff42b409 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-23 10:08:15 +02:00
Joan Sanchez be6b2aa247 updated ticket filter #461 2018-08-23 10:08:06 +02:00
Carlos Jimenez 67fdaecebd Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-23 09:09:54 +02:00
Carlos Jimenez d8075a09e2 refactor of spec file 2018-08-23 09:09:37 +02:00
Carlos Jimenez be85c784ed #529 item/updateTaxes.js Backend unit tests 2018-08-23 09:09:21 +02:00
gerard 7f6f99dc49 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-23 08:58:35 +02:00
gerard c803a754d5 watcher deleted because it was causing bugs in this section 2018-08-23 08:58:28 +02:00
Carlos Jimenez f03cdba029 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-22 14:38:31 +02:00
Carlos Jimenez 7a86beb16a #546 services/loopback/common/methods/ticket/list.js Backend unit tests 2018-08-22 14:38:19 +02:00
gerard 8ff2e40998 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-22 14:24:47 +02:00
gerard 399d43ce79 Tarea #551 /workerMana/getCurrentWorkerMana.js Backend unit tests 2018-08-22 14:24:33 +02:00
Carlos Jimenez 7d488217b5 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-22 13:30:07 +02:00
Carlos Jimenez 7db3a96adc #504 client/item/src/search-panel/index.js Front unit test 2018-08-22 13:29:54 +02:00
Joan Sanchez 544ed62153 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-22 13:28:10 +02:00
Joan Sanchez 997c4c52f9 added backend summary test #520 2018-08-22 13:28:01 +02:00
Carlos Jimenez c91163f7d1 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-22 12:55:49 +02:00
Carlos Jimenez b20ecc307b Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-22 12:55:23 +02:00