verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 71 Releases Wiki Activity
7,908 Commits 300 Branches 0 Tags 129 MiB
Commit Graph

7908 Commits

Author SHA1 Message Date
Joan Sanchez cfceaa531e Merge branch 'dev' into 2350-order_index 2020-07-16 11:18:22 +00:00
Joan Sanchez 6e93d58ab4 Merge pull request 'export production' (#339) from 2369-export_db into dev 
Reviewed-on: #339
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2020-07-16 11:16:49 +00:00
Joan Sanchez 171deeb82c Merge branch 'dev' into 2350-order_index 2020-07-16 11:12:34 +00:00
Joan Sanchez fa43c2ea2f Merge branch 'dev' into 2369-export_db 2020-07-16 10:45:15 +00:00
Joan Sanchez 16be14534b Merge pull request 'Worker calendar - Add absence' (#336) from 1876-worker_calendar into dev 
Reviewed-on: #336
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
 2020-07-16 10:44:13 +00:00
Bernat Exposito Domenech 064b950773 export production 2020-07-16 12:10:18 +02:00
Joan Sanchez a07d960a2e Fixed test 2020-07-16 12:09:50 +02:00
Joan Sanchez cbb2ad7f44 Removed duplicated test 2020-07-16 11:59:16 +02:00
Joan Sanchez 87fa66fe8c Updated methods description 2020-07-16 11:45:44 +02:00
Joan Sanchez bbf3b72001 Added front & back tests 2020-07-16 10:04:16 +02:00
Joan Sanchez 4397060f36 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1876-worker_calendar 2020-07-16 09:21:11 +02:00
Bernat Exposito 0497954b0a Merge branch 'dev' into 1880-refactor_loggable 2020-07-16 07:06:20 +00:00
Joan Sanchez 871b97d3c6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-07-15 12:37:22 +02:00
Joan Sanchez da3d20bb16 Restored limit 2020-07-15 12:11:44 +02:00
Joan Sanchez 72dfa4262a Removed limit 2020-07-15 12:00:38 +02:00
Joan Sanchez 2f9d80be7a Added ACL + unit tests 2020-07-15 11:35:34 +02:00
Joan Sanchez c0d8ac091f Merge pull request 'Item Photo download scheduler' (#338) from 2351-item_image_queue into test 
Reviewed-on: #338
 2020-07-15 09:07:23 +00:00
Joan Sanchez 68c19fa22a Removed test 2020-07-14 11:17:53 +02:00
Joan Sanchez e557bd2815 Renamed method 2020-07-14 11:16:50 +02:00
Joan Sanchez 310b5007f2 Disabled jenkins back tests 2020-07-14 10:42:25 +02:00
Joan Sanchez 3074c9ce35 Fixed async image registration 2020-07-14 09:32:50 +02:00
Joan Sanchez 80075a6471 Added limit 2020-07-13 14:46:00 +02:00
Joan Sanchez 99aa6b666d Mkdir recursive 2020-07-13 14:31:50 +02:00
Joan Sanchez 838b8a5382 Fix scope var 2020-07-13 14:22:19 +02:00
Joan Sanchez ee19ea2993 Restricted to itemFk 2020-07-13 14:13:21 +02:00
Joan Sanchez ccc5b95b48 Updated mount paths 2020-07-13 12:23:47 +02:00
Joan Sanchez 159b5f3bb8 #2351 Item image queue scheduler 2020-07-13 11:58:31 +02:00
Carlos Jimenez Ruiz 79e6871775 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1788-remove_autoload_vnTable 2020-07-13 09:07:38 +02:00
Joan Sanchez 91e739547b Changes 2020-07-11 18:30:27 +02:00
Bernat Exposito Domenech ab8d2be1ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1880-refactor_loggable 2020-07-09 14:14:57 +02:00
Bernat Exposito Domenech 02c82f894a fix e2e errors 2020-07-09 14:14:11 +02:00
Joan Sanchez 24eb400c31 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-07-09 14:02:36 +02:00
Joan Sanchez 7b61e129ff HOTFIX: Change claim claimed quantity 2020-07-09 13:24:56 +02:00
Joan Sanchez 3a8d5c192c HOTFIX: Pagination limit 2020-07-09 12:49:07 +02:00
Bernat Exposito Domenech c31825331d refactor loggable 2020-07-09 11:45:38 +02:00
Bernat Exposito Domenech 9f2c672550 Merge branch '2350-order_index' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index 2020-07-09 11:23:43 +02:00
Bernat Exposito Domenech 996e92bb2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index 2020-07-09 11:21:29 +02:00
Bernat Exposito Domenech b2e3ebc262 cr changes 2020-07-09 11:21:06 +02:00
Joan Sanchez bdc37e7fc1 Merge pull request '2162-print_pdf_puppeteer' (#335) from 2162-print_pdf_puppeteer into dev 
Reviewed-on: #335
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
 2020-07-09 07:26:41 +00:00
Joan Sanchez 0335d6c51e Removed commented lines 2020-07-09 08:45:17 +02:00
Joan Sanchez 65dd591cf4 Merge branch 'dev' into 2162-print_pdf_puppeteer 2020-07-09 06:30:37 +00:00
Bernat Exposito Domenech 7d6ac265b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index 2020-07-09 08:17:03 +02:00
Joan Sanchez 69b845056e Merge branch 'dev' into 2350-order_index 2020-07-09 06:15:06 +00:00
Joan Sanchez 1fa2bd1e1d Merge pull request 'fix bugs in ticket weekly' (#328) from 2338-ticket_weekly into dev 
Reviewed-on: #328
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2020-07-09 06:14:21 +00:00
Joan Sanchez c04d9b0854 Merge branch 'dev' into 2338-ticket_weekly 2020-07-08 16:22:54 +00:00
Joan Sánchez 01b32d2b89 Calendar changes 2020-07-08 15:05:56 +02:00
Joan Sánchez b00f6e6d04 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-07-07 15:13:01 +02:00
Joan Sánchez 7efba25603 Removed role salesPerson for a ticket request 2020-07-07 15:12:36 +02:00
Joan Sanchez 6aca80b075 Merge branch 'dev' into 2338-ticket_weekly 2020-07-07 12:34:04 +00:00
Joan Sánchez dd8e03dd0f Added absence selection 2020-07-07 14:29:57 +02:00