Commit Graph

2273 Commits

Author SHA1 Message Date
Joan Sanchez 30a4bbfe1a Css changes
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 12:41:38 +02:00
Joan Sanchez a343d5eb9a 2394 - Removed call to order_total()
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 11:27:36 +02:00
Carlos Jimenez Ruiz d23e3eff76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-08-26 09:49:52 +02:00
Joan Sanchez 55c88514bd Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 08:29:03 +02:00
Joan Sanchez e12612b0ea Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 08:28:41 +02:00
Joan Sanchez ea4f561bcf Added try-catch
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-08-26 07:33:00 +02:00
Joan Sanchez 7e494962cd Merge branch 'dev' into 2358-route_download_pdf
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 12:27:17 +00:00
Joan Sanchez 9ef58cabd4 Removed console log
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 14:10:38 +02:00
Joan Sanchez f480bdbd9a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 13:46:50 +02:00
Joan Sanchez 74f3229fc5 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 13:45:20 +02:00
Joan Sanchez 17497c3f2d Added unit test
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 10:22:57 +02:00
Joan Sanchez cd74e9684a Download route PDF on route index
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 10:00:21 +02:00
Joan Sanchez 957c1c01b9 Html changes
gitea/salix/pipeline/head This commit looks good Details
2020-08-24 07:54:30 +02:00
Joan Sanchez 80e1577d4f Updated e2e
gitea/salix/pipeline/head This commit looks good Details
2020-08-20 09:50:22 +02:00
Joan Sanchez 4d8a84e774 Fixed back unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-08-20 08:45:03 +02:00
Joan Sanchez f0818acf32 2387 - Fixed error when deleting a zone
gitea/salix/pipeline/head This commit looks good Details
2020-08-19 13:04:12 +02:00
Joan Sanchez a3d3ed4aba Fixed unit test
gitea/salix/pipeline/head This commit looks good Details
2020-08-18 14:14:34 +02:00
Joan Sanchez 55b3e962a4 Merge branch 'dev' into 1361-calendar_date_filter
gitea/salix/pipeline/head There was a failure building this commit Details
2020-08-18 12:03:31 +00:00
Joan Sanchez 540d5e9e71 Fixed errors
gitea/salix/pipeline/head There was a failure building this commit Details
2020-08-18 13:50:08 +02:00
Joan Sanchez 4ef540c8f3 Changed download path
gitea/salix/pipeline/head This commit looks good Details
2020-08-18 09:48:02 +02:00
Joan Sanchez 2a7495bac9 Image queue fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-08-18 09:45:26 +02:00
Joan Sanchez 1ef6637ad3 Added clearInterval()
gitea/salix/pipeline/head This commit looks good Details
2020-08-18 08:37:39 +02:00
Joan Sanchez 8968f41b75 Queue changes
gitea/salix/pipeline/head This commit looks good Details
2020-08-18 08:10:40 +02:00
Joan Sanchez 10aed9d40d Merge branch 'dev' into 2324-ticket_problems
gitea/salix/pipeline/head This commit looks good Details
2020-08-17 12:33:05 +00:00
Joan Sanchez f13c47ce6d Ticket problems filter fix
gitea/salix/pipeline/head This commit looks good Details
2020-08-17 14:31:26 +02:00
Carlos Jimenez Ruiz dee3ab166a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-08-17 14:18:44 +02:00
Joan Sanchez b382e765a0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-08-17 10:10:17 +02:00
Joan Sanchez dd5e71c9fc Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-08-17 09:42:29 +02:00
Carlos Jimenez Ruiz 0e4fc7e2bd removed unused code.
gitea/salix/pipeline/head This commit looks good Details
2020-08-14 18:43:57 +02:00
Carlos Jimenez Ruiz 69cc18be12 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2330-Implement_print_service_testing 2020-08-14 18:42:51 +02:00
Carlos Jimenez Ruiz a679ebfce8 quick fix for updateClaim from other branch 2020-08-14 18:42:45 +02:00
Carlos Jimenez Ruiz b711728999 ultimate edition deluxe
gitea/salix/pipeline/head This commit looks good Details
2020-08-14 17:47:13 +02:00
Carlos Jimenez Ruiz 3df9ae2946 section no longer nukes salesPerson-user relation
gitea/salix/pipeline/head This commit looks good Details
2020-08-14 17:10:59 +02:00
Carlos Jimenez Ruiz 9a9ef5c03f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1361-calendar_date_filter
gitea/salix/pipeline/head This commit looks good Details
2020-08-14 09:23:33 +02:00
Joan Sanchez a10e091b62 Added limit
gitea/salix/pipeline/head This commit looks good Details
2020-08-13 16:26:35 +02:00
Joan Sanchez 7a3de746cc Added limit
gitea/salix/pipeline/head This commit looks good Details
2020-08-13 14:00:40 +02:00
Joan Sanchez bbf15da16f Changed tmp uri
gitea/salix/pipeline/head This commit looks good Details
2020-08-13 13:38:52 +02:00
Joan Sanchez c0794808f0 Updated tmp directory
gitea/salix/pipeline/head This commit looks good Details
2020-08-13 13:09:53 +02:00
Joan Sanchez c9ed17d981 Changes to dowload item photos endpoint
gitea/salix/pipeline/head This commit looks good Details
2020-08-13 12:16:25 +02:00
Joan Sanchez 88c5b6f8a6 Changed ticket problems min date
gitea/salix/pipeline/head This commit looks good Details
2020-08-13 08:23:55 +02:00
Bernat Exposito Domenech 689245c27d fix test
gitea/salix/pipeline/head This commit looks good Details
2020-08-12 14:23:13 +02:00
Bernat Exposito Domenech a523030c54 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2388_export-structure 2020-08-12 14:22:55 +02:00
Bernat Exposito Domenech 1e56619c33 export structure and fix test 2020-08-12 13:07:58 +02:00
Joan Sanchez 1486cbb4e7 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-08-12 12:00:46 +02:00
Joan Sanchez de9d1268b7 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-08-12 11:38:39 +02:00
Joan Sanchez b0df4973e9 2384 - Searchbar filters fixed
gitea/salix/pipeline/head This commit looks good Details
2020-08-12 08:26:00 +02:00
Joan Sanchez b50b30c792 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-08-11 12:16:19 +02:00
Joan Sanchez d17f289af9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1361-calendar_date_filter 2020-08-11 07:42:26 +02:00
Joan Sanchez 7833b87475 Added filter
gitea/salix/pipeline/head This commit looks good Details
2020-08-10 14:44:57 +02:00
Joan Sanchez e2c742c893 #2383 - Changed model
gitea/salix/pipeline/head This commit looks good Details
2020-08-10 14:29:25 +02:00
Bernat Exposito 1ad9f544eb Merge branch 'dev' into 2368-entry_buy
gitea/salix/pipeline/head This commit looks good Details
2020-08-03 06:12:47 +00:00
Carlos Jimenez Ruiz 6007506633 wider space for tags
gitea/salix/pipeline/head This commit looks good Details
2020-07-31 11:43:56 +02:00
Carlos Jimenez Ruiz 810b072e14 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2368-entry_buy 2020-07-31 10:51:34 +02:00
Carlos Jimenez Ruiz ede73bfe92 removed id from descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-07-30 16:40:40 +02:00
Carlos Jimenez Ruiz e974f638dd 2361 ticket sale multi check fix-ish +popover size
gitea/salix/pipeline/head This commit looks good Details
2020-07-30 16:05:48 +02:00
Carlos Jimenez Ruiz 9402f368f6 ticket index and zone descriptor refactor
gitea/salix/pipeline/head This commit looks good Details
2020-07-30 12:51:19 +02:00
Carlos Jimenez Ruiz 85b3b52e39 took a while to confirm this one
gitea/salix/pipeline/head This commit looks good Details
2020-07-29 10:54:45 +02:00
Carlos Jimenez Ruiz e2481366a2 removed on response if just accept
gitea/salix/pipeline/head This commit looks good Details
2020-07-29 10:47:48 +02:00
Carlos Jimenez Ruiz e126350079 scroll removed as it comes from layaout 2020-07-28 19:22:21 +02:00
Carlos Jimenez Ruiz c62801e741 modules component to vnComponent working
gitea/salix/pipeline/head This commit looks good Details
2020-07-24 14:22:30 +02:00
Carlos Jimenez Ruiz 6913f2db72 $httpBackend.when and .expect no longer misused
gitea/salix/pipeline/head This commit looks good Details
2020-07-23 17:10:07 +02:00
Carlos Jimenez Ruiz 4ca004f833 angular.mock.injet shorten to inject 2020-07-23 16:46:16 +02:00
Carlos Jimenez Ruiz 7d5dc776c1 replaced most of the translate.instant for $t 2020-07-23 16:07:08 +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 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
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 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
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
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 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 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
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 b2e3ebc262 cr changes 2020-07-09 11:21:06 +02: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 c04d9b0854 Merge branch 'dev' into 2338-ticket_weekly
gitea/salix/pipeline/head This commit looks good Details
2020-07-08 16:22:54 +00:00
Joan Sánchez 01b32d2b89 Calendar changes
gitea/salix/pipeline/head This commit looks good Details
2020-07-08 15:05:56 +02:00