Commit Graph

3489 Commits

Author SHA1 Message Date
gerard d3ce915b5d refactor to add disable 2018-09-05 13:56:07 +02:00
gerard f23ea2d821 fixed typo 2018-09-05 13:48:18 +02:00
gerard 1bfd6a8ec0 updated acl 2018-09-05 13:47:53 +02:00
gerard c04616d6dc updated acl 2018-09-05 13:47:35 +02:00
gerard c424e845d1 Tarea #606 claim.summary 2018-09-05 13:47:15 +02:00
Juan b12fa80aa2 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-05 13:01:30 +02:00
Juan bf0e1eeaf3 CrudModel: improved, docs, bugs fixed 2018-09-05 13:01:21 +02:00
gerard 4221410ff5 claim detail addItem selector fixed 2018-09-05 12:54:21 +02:00
gerard b5448aaa5a Tarea #446 claim.development 2018-09-05 11:48:38 +02:00
gerard 0333ba96b0 Tarea #445 claim.detail 2018-09-05 11:45:33 +02:00
gerard dacdc39a28 Tarea #447 claim.action 2018-09-05 11:35:34 +02:00
gerard 02f612b4d5 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-05 11:34:35 +02:00
gerard 732c100096 Tarea #447 claim.action 2018-09-05 11:34:23 +02:00
Bernat a98ae9d4ae add new fixtures for table sample 2018-09-05 11:07:05 +02:00
Joan Sanchez 515b36e5bb gulp install 2018-09-05 09:05:55 +02:00
Joan Sanchez b3bba5401f jenkins install dev dependencies 2018-09-05 08:33:08 +02:00
Carlos Jimenez 3e1b6b82d4 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-09-05 08:28:00 +02:00
Carlos Jimenez 9b6b08400f lint warnings corrected + en json 2018-09-05 08:27:50 +02:00
Carlos Jimenez e00d054fe9 too many nested callbacks warning corrected 2018-09-05 08:24:15 +02:00
Joan Sanchez 6e9bc4645c translation fix 2018-09-05 07:54:45 +02:00
Carlos Jimenez 566c8e619e #604 e2e de la seccion ticket.sale fallo de traducciones 2018-09-04 16:59:46 +02:00
gerard d991731f98 bug with clear function solved 2018-09-04 16:51:29 +02:00
Joan Sanchez d3406fecde claim search-panel & connector-mysql fix date 2018-09-04 15:08:36 +02:00
Bernat ba51c0cc97 update fixtures table sale, saleComponent and fix test 2018-09-04 14:52:38 +02:00
Bernat 21903c6414 update fixtures table sale and fix test 2018-09-04 14:10:59 +02:00
Carlos Jimenez b311524f11 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-09-04 13:53:19 +02:00
Carlos Jimenez eab15e7598 the removed line was making the translation to work on the opposite way 2018-09-04 13:53:04 +02:00
Joan Sanchez ae4fa8d509 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-04 13:03:51 +02:00
Joan Sanchez fa631e5ac2 descriptor quicklings fixed #593 2018-09-04 13:01:53 +02:00
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