Commit Graph

1897 Commits

Author SHA1 Message Date
Javi Gallego d12524d045 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-06 13:09:15 +01:00
Javi Gallego 4c7ba9859c anguar inject minimify fixed factor VnPatch 2018-03-06 13:08:39 +01:00
Carlos Jimenez 8ee3c18cbc removed unused code 2018-03-06 13:02:28 +01:00
Javi Gallego ffee716409 Revert "Merge branch 'test' into dev"
This reverts commit b6091775e5, reversing
changes made to 42f1e1ec6f.
2018-03-06 13:01:05 +01:00
Javi Gallego b6091775e5 Merge branch 'test' into dev 2018-03-06 12:48:22 +01:00
Javi Gallego 2a5efb04ae angular inject minimify fixed factor VnPatch 2018-03-06 12:44:10 +01:00
Carlos Jimenez 42f1e1ec6f #114 style 2018-03-06 12:08:25 +01:00
Bernat Exposito a6556e594d update trigger client, #154 2018-03-06 11:22:57 +01:00
Carlos Jimenez bc13abbe50 #114 mostrar current user en la top bar 2018-03-06 11:13:05 +01:00
Bernat Exposito e9ad6bf879 update model creditClassification 2018-03-06 09:41:16 +01:00
Bernat Exposito 96689eccc8 add models creditClassification and creditInsurance, update fixtures #151 2018-03-06 08:55:54 +01:00
Carlos Jimenez 13c3ffce27 routes spec fix 2018-03-05 15:24:54 +01:00
Carlos Jimenez 62679342a7 #145 e2e refactor 2018-03-05 15:21:14 +01:00
Bernat Exposito 70ef95fc8f refactor fixtures update id clients,debug web test and back test 2018-03-05 14:59:26 +01:00
Carlos Jimenez 1f978828f7 part of the task #145 corrected lock of verified data nested callbacks 2018-03-05 12:28:59 +01:00
Carlos Jimenez c2017f85e8 part of the task #145 refactoring e2e paths 2018-03-05 12:26:00 +01:00
Joan Sanchez 24abbffba7 Client summary updated 2018-03-05 10:56:51 +01:00
Carlos Jimenez 03cc30d680 refactor on e2e paths 2018-03-02 18:42:35 +01:00
Carlos Jimenez bdc0e5ddc1 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-03-02 14:46:04 +01:00
Carlos Jimenez 6f0d9c31bb e2e path for client invoices #111 2018-03-02 14:45:54 +01:00
Carlos Jimenez ab84f490e3 e2e path lock of veridied data #116 2018-03-02 14:45:22 +01:00
Juan 8970662ff8 Redundant LDAP authentification test 2018-03-02 14:34:44 +01:00
Vicente Falco 12d34668a9 Jenkins 2018-03-02 14:31:44 +01:00
Juan d9a75acde0 LDAP authentification test 2018-03-02 14:31:15 +01:00
Carlos Jimenez 6aca1ac3a4 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-03-02 14:05:11 +01:00
Juan 8673d2b25f Eslint fix 2018-03-02 13:46:25 +01:00
Vicente Falco 2d05b61c8d Jenkins 2018-03-02 13:26:31 +01:00
Vicente Falco 0ed7e5ee25 Jenkins 2018-03-02 13:08:48 +01:00
Carlos Jimenez 56a32343fd style fix 2018-03-02 13:00:01 +01:00
Bernat Exposito 8776a46e58 add more tables in export-data.cmd 2018-03-02 12:41:52 +01:00
Carlos Jimenez d20f2379ac removed focus on describe 2018-03-02 12:33:12 +01:00
Carlos Jimenez 326d762cd1 now each e2e path calls it's own loging function for dev to use differente users 2018-03-02 12:15:17 +01:00
Carlos Jimenez d3e2f93816 now two users havent got the verified data checked 2018-03-02 12:00:47 +01:00
Carlos Jimenez b23617fcfb item tag unit tests 2018-03-02 10:54:03 +01:00
Carlos Jimenez f354a420bc e2e item tags #121, plus item tags and item descriptor refactor #117 2018-03-02 10:51:01 +01:00
Juan 4a473f5c0f Style fix 2018-03-01 23:49:01 +01:00
Juan 2c4fed4938 Style fixes 2018-03-01 23:41:27 +01:00
Juan 128c0d0ea3 vnCard style bug fixed 2018-03-01 23:38:14 +01:00
Juan 127c5e6c02 Style fixes 2018-03-01 21:54:18 +01:00
Juan 4b12411d6b Style fixes 2018-03-01 21:18:43 +01:00
Juan 98388dde85 Image zoom bugs solved 2018-03-01 19:35:32 +01:00
Juan e713ce01b4 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-01 16:52:47 +01:00
Juan c0f34bdd37 #142 & #143 - New descriptors header 2018-03-01 16:52:35 +01:00
Bernat Exposito 1b4d4faf0b Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-01 14:48:02 +01:00
Daniel Herrero e683ee66c1 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-01 14:48:09 +01:00
Daniel Herrero 40e2b73e7c tarea #105 in progress 2018-03-01 14:48:02 +01:00
Bernat Exposito 836d7dc054 update structure and data from production DB 2018-03-01 14:47:25 +01:00
Juan 2c88d24e24 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-01 14:04:40 +01:00
Juan 9881c4e6f3 Merge 2018-03-01 14:04:33 +01:00
Bernat Exposito f6c6ee1596 update fixtures adding data to vn.recovery 2018-03-01 14:02:51 +01:00