Commit Graph

8020 Commits

Author SHA1 Message Date
Bernat Exposito Domenech b972353bb4 create method getComponentSum 2020-07-21 11:11:09 +02:00
Carlos Jimenez Ruiz 59e43ea17f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1788-remove_autoload_vnTable
gitea/salix/pipeline/head This commit looks good Details
2020-07-20 11:51:23 +02:00
Carlos Jimenez Ruiz f9da489a96 excluded unfinished tests WIP
gitea/salix/pipeline/head This commit looks good Details
2020-07-20 11:50:21 +02:00
Carlos Jimenez Ruiz f2730dd51c some parts of latestsBuys WIP
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-20 11:31:47 +02:00
Joan Sanchez 648c87e763 Removed .DS_Store files
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 14:31:44 +02:00
Joan Sanchez 84c74744b4 Merge pull request '1880-refactor_loggable' (#337) from 1880-refactor_loggable into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #337
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-07-16 12:12:05 +00:00
Joan Sanchez 0348b79f0d Merge branch 'dev' into 1880-refactor_loggable
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 12:03:22 +00:00
Joan Sanchez 0c17423370 Merge pull request '2350-order_index' (#334) from 2350-order_index into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #334
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-07-16 12:01:55 +00:00
Bernat Exposito Domenech 93006814a1 Merge branch '1880-refactor_loggable' of https://gitea.verdnatura.es/verdnatura/salix into 1880-refactor_loggable
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 13:46:52 +02:00
Bernat Exposito Domenech 8c926a1a7f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1880-refactor_loggable 2020-07-16 13:20:41 +02:00
Joan Sanchez cfceaa531e Merge branch 'dev' into 2350-order_index
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 11:12:34 +00:00
Joan Sanchez fa43c2ea2f Merge branch 'dev' into 2369-export_db
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-16 12:10:18 +02:00
Joan Sanchez a07d960a2e Fixed test
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 12:09:50 +02:00
Joan Sanchez cbb2ad7f44 Removed duplicated test
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-16 11:59:16 +02:00
Joan Sanchez 87fa66fe8c Updated methods description
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 11:45:44 +02:00
Joan Sanchez bbf3b72001 Added front & back tests
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 07:06:20 +00:00
Bernat Exposito Domenech f7100f11ee first step add right menu in ticket components 2020-07-16 07:43:07 +02:00
Joan Sanchez 871b97d3c6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-07-15 12:37:22 +02:00
Joan Sanchez da3d20bb16 Restored limit
gitea/salix/pipeline/head This commit looks good Details
2020-07-15 12:11:44 +02:00
Joan Sanchez 72dfa4262a Removed limit
gitea/salix/pipeline/head This commit looks good Details
2020-07-15 12:00:38 +02:00
Joan Sanchez 2f9d80be7a Added ACL + unit tests
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #338
2020-07-15 09:07:23 +00:00
Joan Sanchez 68c19fa22a Removed test
gitea/salix/pipeline/head This commit looks good Details
2020-07-14 11:17:53 +02:00
Joan Sanchez e557bd2815 Renamed method
gitea/salix/pipeline/head This commit looks good Details
2020-07-14 11:16:50 +02:00
Joan Sanchez 310b5007f2 Disabled jenkins back tests
gitea/salix/pipeline/head This commit looks good Details
2020-07-14 10:42:25 +02:00
Joan Sanchez 3074c9ce35 Fixed async image registration
gitea/salix/pipeline/head This commit looks good Details
2020-07-14 09:32:50 +02:00
Joan Sanchez 80075a6471 Added limit
gitea/salix/pipeline/head This commit looks good Details
2020-07-13 14:46:00 +02:00
Joan Sanchez 99aa6b666d Mkdir recursive
gitea/salix/pipeline/head This commit looks good Details
2020-07-13 14:31:50 +02:00
Joan Sanchez 838b8a5382 Fix scope var
gitea/salix/pipeline/head This commit looks good Details
2020-07-13 14:22:19 +02:00
Joan Sanchez ee19ea2993 Restricted to itemFk
gitea/salix/pipeline/head This commit looks good Details
2020-07-13 14:13:21 +02:00
Joan Sanchez ccc5b95b48 Updated mount paths
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-13 12:23:47 +02:00
Joan Sanchez 159b5f3bb8 #2351 Item image queue scheduler
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-13 09:07:38 +02:00
Joan Sanchez 91e739547b Changes
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-09 14:02:36 +02:00
Joan Sanchez 7b61e129ff HOTFIX: Change claim claimed quantity
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-09 13:24:56 +02:00
Joan Sanchez 3a8d5c192c HOTFIX: Pagination limit
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #335
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-07-09 07:26:41 +00:00