Commit Graph

3110 Commits

Author SHA1 Message Date
gerard 98aae36087 claim hidden again 2018-09-04 13:01:53 +02:00
gerard 4b106d0b91 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-04 12:33:35 +02:00
gerard bc905939e3 claim hidden again 2018-09-04 12:33:15 +02:00
Joan Sanchez afb5bdf4d0 descriptor quicklings fixed #593 2018-09-04 12:29:22 +02:00
Javi Gallego 955a7f0aae merge 2018-09-04 12:01:44 +02:00
Joan Sanchez 3b27c485e0 env rollback 2018-09-04 11:59:27 +02:00
Javi Gallego dda12c4b62 #460 expedition 2018-09-04 11:57:41 +02:00
Joan Sanchez 9da95f637e descriptor quicklings fixed #593 2018-09-04 11:49:00 +02:00
Carlos Jimenez eea42ec958 toma toma toma selectores! 2018-09-04 11:38:48 +02:00
Carlos Jimenez 95a85f84f2 #620 e2e claim basic data 2018-09-04 11:24:39 +02:00
gerard e8d7fbbf96 Tarea #489 /components/textarea/textarea.js Front unit test 2018-09-04 10:11:01 +02:00
gerard 6967480398 Tarea #627 Refactorizar la directiva Textarea 2018-09-04 10:10:29 +02:00
gerard f46c684ffd Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-04 10:10:05 +02:00
Bernat b2317491f5 update fixtures tickets alias and fix test 2018-09-04 09:50:39 +02:00
gerard 570bf3133d Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-04 08:09:23 +02:00
Carlos Jimenez 8ab9fd270e Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-09-03 14:53:04 +02:00
Carlos Jimenez 2674783218 #605 e2e ticket.basicData 2018-09-03 13:54:35 +02:00
Joan Sanchez 6c682875a0 mailer css removed justify text. Fixed chrome image content-type. 2018-09-03 13:54:18 +02:00
gerard b46bc7d296 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-03 11:03:10 +02:00
Joan Sanchez d5e0d3beef updated itemDiary front unit test 2018-09-03 10:55:04 +02:00
Joan Sanchez 14b85b874b th component front unit test #491 2018-09-03 09:54:31 +02:00
Joan Sanchez c39db598ac Item diary select correct position #619 2018-09-03 08:09:56 +02:00
Joan Sanchez fdb7a9630b Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-31 15:18:59 +02:00
Joan Sanchez 1597d3c847 ticket filter fix 2018-08-31 15:18:53 +02:00
gerard 065d236abb claim module teporally shown 2018-08-31 14:49:16 +02:00
gerard f81c97dee9 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-31 14:35:30 +02:00
gerard 2d21f84f8b Tarea #443 claim list 2018-08-31 14:35:20 +02:00
Carlos Jimenez f412d3c486 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-31 13:07:05 +02:00
Carlos Jimenez 25ac0db1cb #497 module-loader.js Front unit test 2018-08-31 13:06:39 +02:00
Joan Sanchez 8879005854 fixed ticket list pagination 2018-08-31 12:39:57 +02:00
Carlos Jimenez bc2554e6f9 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-31 11:25:30 +02:00
Joan Sanchez ff3c37f692 itemDiary procedure 2018-08-31 08:07:01 +02:00
Joan Sanchez f3fc211dfa removed unused routes, filter and crud routes #409 2018-08-31 07:53:38 +02:00
Carlos Jimenez 58042027cf small refactors 2018-08-30 16:15:30 +02:00
Carlos Jimenez c0c4961717 #487 step-control.js front unit test 2018-08-30 16:15:10 +02:00
Javi Gallego eba193999c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-30 13:12:09 +02:00
Javi Gallego 7308fa167f fix settings.json 2018-08-30 13:10:38 +02:00
Carlos Jimenez 2ef19c8640 electron show property is set to false by default now. 2018-08-30 12:11:06 +02:00
Javi Gallego 87b0908ee4 cambio asociado al warehouse 2018-08-30 11:44:39 +02:00
Javi Gallego cda926dcb7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-30 11:02:55 +02:00
Javi Gallego c4e0fc74a3 Bug #452 quitamos servicio production 2018-08-30 11:02:50 +02:00
Joan Sanchez 98e22b9151 ticket index front-end test 2018-08-30 09:56:04 +02:00
Joan Sanchez 30b3d389c7 ticket total decimals 2018-08-30 09:49:29 +02:00
Joan Sanchez aa4f0fef5c e2e fix 2018-08-30 09:33:02 +02:00
gerard 61b9b0c7bc Tarea #445 claim.detail 2018-08-30 09:19:09 +02:00
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