Commit Graph

254 Commits

Author SHA1 Message Date
Vicent Llopis 6f7ec12cb2 feat: response as 'reply' and not as 'internNote'
gitea/salix/pipeline/head This commit looks good Details
2022-10-19 10:35:41 +02:00
Alex Moreno 0bc018ec02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:06:31 +02:00
Alex Moreno 6bfd54fc71 feat(verify): use user.verify
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 07:22:22 +02:00
Alex Moreno c2d37dadf7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue 2022-10-14 08:01:06 +02:00
Alex Moreno e240702884 use user
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-13 14:55:34 +02:00
Alex Moreno acc88c8239 use ejs template
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 14:56:33 +02:00
Alex Moreno 2e36164a98 fix(recover-password): use pint/Email
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 10:06:25 +02:00
Alex Moreno 5c4daee35e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 14:20:22 +02:00
Joan Sanchez 8ccb47d741 Merge pull request '4073-feat(user): add section privileges and remove changeRole in descriptor' (#1073) from 4073-user_privileges into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1073
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-10-06 11:54:16 +00:00
Joan Sanchez f2eaa9d0e5 Merge branch 'dev' into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 06:28:00 +00:00
Alex Moreno 7a690dd880 feat(user): add section privileges and remove changeRole in descriptor
gitea/salix/pipeline/head This commit looks good Details
test(user):back and e2e
2022-10-03 15:11:29 +02:00
Joan Sanchez 1ac35c0b68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:52:31 +02:00
Alex Moreno 81752e7f30 quit userError 2022-09-28 12:20:29 +02:00
Joan Sanchez 660842ca31 Osticket & waste refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 14:20:57 +02:00
Alex Moreno 2c691eb796 feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 14:49:11 +02:00
Alex Moreno dc605387ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:23:10 +02:00
Alex Moreno fc5460dc9e feat(account): send verifyEmail when change email and tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:21:58 +02:00
Alex Moreno 00f5689825 feat(account): recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-21 15:15:19 +02:00
Alex Moreno 918863ee8e feat(account): recover-password
gitea/salix/pipeline/head This commit looks good Details
2022-09-20 15:21:01 +02:00
Vicent Llopis 6367f1ef05 refator: delete sensitive info
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 11:46:55 +02:00
Vicent Llopis cfe5c66fe4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4155-close_tickets
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 09:23:56 +02:00
Vicent Llopis 28bf7bd747 feat: check general status 'open' to close ticket
gitea/salix/pipeline/head This commit looks good Details
2022-09-15 08:34:42 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 12:13:31 +02:00
Vicent Llopis 538c04e8c5 feat: db connection and query
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 11:59:03 +02:00
Vicent Llopis e5349ec7ed fix: send messages to channels
gitea/salix/pipeline/head This commit looks good Details
2022-07-27 09:16:49 +02:00
Alex Moreno 8048d4ce90 feat(notification): basic functionality and test 2022-07-25 08:25:10 +02:00
Vicent Llopis eccbd942f7 feat: can close a ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-21 13:11:24 +02:00
Vicent Llopis 0ff3a9d45a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4155-close_tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-21 12:23:44 +02:00
Alex Moreno 9b48cbb078 feat(notification): send
gitea/salix/pipeline/head This commit looks good Details
2022-07-20 14:54:50 +02:00
Alex Moreno 7895decf4e feat(notification): create models
gitea/salix/pipeline/head This commit is unstable Details
2022-07-19 15:17:22 +02:00
Vicent Llopis 5eec01bdc3 feat: close tickets
gitea/salix/pipeline/head This commit looks good Details
2022-07-19 11:20:08 +02:00
Carlos Jimenez Ruiz d0e06a46d0 removed deprecated stowaway comp and usages
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-01 09:15:07 +02:00
Vicent Llopis f6028316f4 feat: endpoint sendQueued addded
gitea/salix/pipeline/head This commit looks good Details
2022-06-02 14:55:39 +02:00
Carlos Jimenez Ruiz c721d9ae82 Merge branch 'dev' into 4022-client.balance.create
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:43:00 +00:00
Vicent Llopis a043c5d346 refactor: request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 13:10:48 +02:00
Vicent Llopis c9bfbe990a refactor: request changues
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:53:10 +02:00
Vicent Llopis eeede417eb feat: update date depending of accountingType
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 12:24:35 +02:00
Vicent Llopis ebbb0466a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models
gitea/salix/pipeline/head This commit is unstable Details
2022-05-17 10:13:05 +02:00
Carlos Jimenez Ruiz d31f7f1b6b all type Dates replaced to date as per convention
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 10:19:43 +02:00
Carlos Jimenez Ruiz b5ccd32800 Merge branch 'dev' into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 07:23:08 +00:00
Javi Gallego 0d63f3c3af Merge branch 'dev' into 3851-dms_delete
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 11:13:34 +02:00
Alex Moreno 5021315ed4 refactor(clientCredit): test and types
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 09:47:47 +02:00
Vicent Llopis a0af774837 fix: test
gitea/salix/pipeline/head This commit looks good Details
2022-05-06 09:02:52 +02:00
Javi Gallego 6584a29ce5 create deleteTrashFiles
gitea/salix/pipeline/head This commit looks good Details
2022-05-03 11:16:56 +02:00
Vicent Llopis bad90c12f4 feat: add required fields and models
gitea/salix/pipeline/head This commit looks good Details
2022-04-27 14:17:41 +02:00
Carlos Jimenez Ruiz 8efcb6233f feat(user): added userConfig.darkMode relation towards account.user
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 10:25:01 +02:00
Joan Sanchez fb514c21d6 Removed model ACL
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-11 12:11:59 +02:00
Joan Sanchez 47a2f76aa4 3837 - Import data from external service
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-11 11:58:40 +02:00
Joan Sanchez 00c53a7709 3668 - Deprecated field "isOfficial"
gitea/salix/pipeline/head This commit looks good Details
2022-03-18 11:06:16 +01:00
Joan Sanchez b71e7440b3 Merge branch 'dev' into 3634-rocketchat_status
gitea/salix/pipeline/head This commit looks good Details
2022-03-01 09:49:11 +00:00
Alex Moreno f3ff64c44d refactor(docuware): name for code
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 08:11:54 +01:00
Joan Sanchez 0d8dffac30 refactor(chat): check rocketchat status before sending message
gitea/salix/pipeline/head This commit looks good Details
2022-02-22 07:30:26 +01:00
Alex Moreno 0f4649c50f feat(ticket_descriptor-menu): docuware implemented
gitea/salix/pipeline/head This commit looks good Details
2022-02-21 08:48:53 +01:00
Alex Moreno 3aeb2adb56 feat(ticket): docuware pdf
gitea/salix/pipeline/head There was a failure building this commit Details
2022-02-16 14:57:47 +01:00
Alex Moreno 651c92698f feat(docuware): start download docuware
gitea/salix/pipeline/head This commit looks good Details
2022-02-15 16:48:37 +01:00
Alex Moreno e09e84c36b refactor(setSaleQuantity): rename, remove transaction
gitea/salix/pipeline/head This commit looks good Details
2022-02-08 12:41:55 +01:00
Alex Moreno 77d0dcae0d feat(setQuantitySale): back route and test
gitea/salix/pipeline/head This commit looks good Details
2022-02-02 08:28:07 +01:00
Carlos Jimenez Ruiz 0bf553e11e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-10 17:07:39 +01:00
Vicent Llopis fbbb1ecdf6 feat(client_balance): add maxImport if "cash"
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-08 08:59:42 +01:00
Carlos Jimenez Ruiz b27a443729 show/hide columns and load default view
gitea/salix/pipeline/head This commit looks good Details
2021-10-27 17:11:33 +02:00
Carlos Jimenez Ruiz c4c1aa929a refactor(endpoints): corrected indentation and removed unused code
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 16:00:50 +02:00
Joan Sanchez 7ccb325ecc fix(model): added everyone ACL to model
gitea/salix/pipeline/head This commit looks good Details
2021-10-01 08:39:42 +02:00
Carlos Jimenez Ruiz 0337a1d6db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3079-export_production
gitea/salix/pipeline/head This commit looks good Details
2021-09-02 14:17:50 +02:00
Carlos Jimenez Ruiz 85844973d6 refactor(geolocation): create province now uses autonomy instead of country
gitea/salix/pipeline/head There was a failure building this commit Details
2021-09-02 11:56:59 +02:00
Joan Sanchez 84c4b8b7f0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2021-09-02 08:22:39 +02:00
Joan Sanchez 4f8e319b89 fix(model): Added missing property "isAutoConciliated" to accounting-type model
gitea/salix/pipeline/head This commit looks good Details
2021-09-02 08:22:18 +02:00
Carlos Jimenez Ruiz abbce74100 clone invoiceIn from descriptor 2021-07-23 14:06:48 +02:00
Carlos Jimenez Ruiz 15c7c0cb4b read acl set on the model
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 15:31:58 +02:00
Carlos Jimenez Ruiz 8344a58ab8 updated client/worker/user IDs on tests
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 13:24:23 +02:00
Carlos Jimenez Ruiz 9f00fd11d2 favorite modules positions 2021-06-01 22:18:13 +02:00
Carlos Jimenez Ruiz d440a631c8 getUserConfig now gets default company and warehouse with dynamic code
gitea/salix/pipeline/head This commit looks good Details
2021-05-24 17:41:22 +02:00
Carlos Jimenez Ruiz 8a8c2fa39f e2e partially working for account module 2021-05-03 08:01:29 +02:00
Joan Sanchez 6eba19a1b7 OsTicket notifications
gitea/salix/pipeline/head This commit looks good Details
2021-04-12 07:48:29 +02:00
Joan Sanchez 4b9b29fc94 Hotfix: Removed default nRefs value for image model
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 07:58:39 +02:00
Carlos Jimenez Ruiz 97667595e5 removed unused ACL and fixed typos
gitea/salix/pipeline/head This commit looks good Details
2021-03-02 10:33:35 +01:00
Carlos Jimenez Ruiz cd084a53e5 styling update + acls
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-01 16:13:47 +01:00
Carlos Jimenez Ruiz bebaef7879 sql changes moved to correct folder 2021-03-01 13:07:23 +01:00
Carlos Jimenez Ruiz 23cc4bbfeb starred modules working pre-e2e and css amends 2021-03-01 12:15:13 +01:00
Carlos Jimenez Ruiz bb2912d05a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2585-pinned_module_icons
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-26 09:10:28 +01:00
Carlos Jimenez Ruiz 3dff5f06ff starred modules front and backend 1st steps 2021-02-26 09:08:31 +01:00
Joan Sanchez 89abf424fb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-02-25 08:17:26 +01:00
Joan Sanchez 1c819e692e Floramondo image download fixes
gitea/salix/pipeline/head This commit looks good Details
2021-02-24 14:37:49 +01:00
Joan Sanchez 347ac77878 Changes to file names
gitea/salix/pipeline/head This commit looks good Details
2021-02-24 09:59:41 +01:00
Joan Sanchez 5b40edb284 Line break
gitea/salix/pipeline/head This commit looks good Details
2021-02-17 16:11:34 +01:00
Jorge Padawan aa29f546ae put global bank entity model
gitea/salix/pipeline/head This commit looks good Details
2021-02-17 15:05:17 +01:00
Joan Sanchez 2c9fd45958 2778 - Allow edit order number
gitea/salix/pipeline/head This commit looks good Details
2021-02-05 12:09:48 +01:00
Joan Sanchez d589dd435c Default image refs to 1
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2021-02-04 18:23:22 +01:00
Joan Sanchez 4ac207c568 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2763-notify_urgent_issue
gitea/salix/pipeline/head This commit looks good Details
2021-02-01 12:58:50 +01:00
Joan Sanchez f5f4c5936d 2763 - Notify urgen issues
gitea/salix/pipeline/head This commit looks good Details
2021-02-01 09:29:47 +01:00
Carlos Jimenez Ruiz bf9f5bba49 corrected model types 2021-01-21 11:02:48 +01:00
Javi Gallego d3b5300553 test
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 16:30:14 +01:00
Javi Gallego 36bace2a94 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2020-12-22 07:42:28 +01:00
Joan Sanchez 42cd2356a2 Refactor v2
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-18 17:23:04 +01:00
Javi Gallego 2bb9125eee Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 08:34:54 +01:00
Javi Gallego 963db11686 funcionalidad
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 08:33:08 +01:00
Joan Sanchez 0a4016be41 Updated unit tests & changed ACL
gitea/salix/pipeline/head This commit looks good Details
2020-12-11 15:04:55 +01:00
Joan Sanchez 1ba1d27ba0 2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-27 13:10:39 +01:00
Carlos Jimenez Ruiz 4172d0bb9b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 18:51:16 +01:00
Joan Sanchez d40ea52560 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-20 15:06:34 +01:00
Joan Sanchez 7693a1c449 2569 - Section changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-20 15:05:57 +01:00