Commit Graph

96 Commits

Author SHA1 Message Date
Alex Moreno 0949112b13 Merge branch 'dev' of https: refs #7547//gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 12:42:13 +02:00
Jorge Penadés c31e33535d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7524-limitSelect
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-06 15:23:59 +02:00
Jorge Penadés 766da06c2f feat: refs #7524 add mock limit on find query
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-30 09:40:34 +02:00
Jorge Penadés 254cced550 chore: refs #6989 add config model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 13:40:30 +02:00
Alex Moreno b8244b48e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 09:08:47 +02:00
Pablo Natek 64bddd4f63 feat: refs #6403 add dynamic clientType
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-10 10:41:52 +02:00
Alex Moreno 7f278269a5 feat(AccessToken&ACL): refs #7547 upgrade security
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 14:28:55 +02:00
Sergio De la torre c87f060d51 feat boxPicking refs #7357 2024-06-20 09:21:27 +02:00
Carlos Satorres 7f1210e712 refs #6820 fix back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 10:26:09 +02:00
Pablo Natek 4693ba13fa Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-26 08:37:51 +02:00
Pablo Natek 77f7348acb feat(workcenter): refs #4988 add workcenter config menu
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 09:02:01 +02:00
Pablo Natek d0dfdc668b feat(agency): refs #4988 add new agency
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 16:25:27 +02:00
Javi Gallego 58baa45e09 Merge branch 'dev' into 7108-exchange-rate
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-16 09:47:21 +02:00
Javi Gallego bc9149ec37 feat: tipo de cambio php to js 2024-04-11 14:32:26 +02:00
Pablo Natek da037c5235 refactor: refs #6005 delay on productionConfig 2024-04-09 13:34:33 +02:00
Sergio De la torre 375b690063 Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 09:12:45 +00:00
Sergio De la torre dd732297c4 Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 07:31:04 +01:00
Sergio De la torre 69ad44c0bd Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 07:18:16 +01:00
Guillermo Bonet 39b4e5db28 Merge branch 'dev' into 6948-bank
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 06:17:26 +00:00
Guillermo Bonet e0732835d0 refactor: refs #6948 Bank to Accouting
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 10:25:23 +01:00
Jorge Penadés c875abf5e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 09:42:14 +01:00
Sergio De la torre 96abdd4630 refs #6078 feat:add workeractivity 2024-02-26 12:52:34 +01:00
Pablo Natek d2d28889b6 merge(master): refs #6403 merge master fix conflicts
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-02-07 16:55:09 +01:00
Pablo Natek 73c0ca5382 feat(mrwXml): refs #6403 render and transmEnvio integrated
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-15 15:00:36 +01:00
Jorge Penadés 7a64b57a2a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 15:07:33 +01:00
Javier Segarra 2fe631f078 refs #5666 feat: change models permissions 2023-12-05 07:15:22 +01:00
Jorge Penadés fac6aab26c refs #6276 machineWorker_update
gitea/salix/pipeline/head This commit looks good Details
2023-11-22 14:25:19 +01:00
Javier Segarra 5dbfe31a60 refs #5666 feat: define VnRole 2023-11-10 15:12:03 +01:00
Sergio De la torre 4c1ff2e4d7 refs #6141feat:buyer model
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 08:27:49 +02:00
Vicent Llopis 17b2b02246 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4734-addViaexpress
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 09:16:32 +02:00
Alex Moreno d6c504d3bb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 07:53:40 +02:00
Alex Moreno 3a5e591cf0 refs #5475 feat(signin): use twoFactor and passExpired
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-14 15:15:00 +02:00
Vicent Llopis 0cc5781f3f refs #4734 feat: añadido método putExpedicionInternacional de viaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 15:05:37 +02:00
Vicent Llopis eab329b230 refs #554 feat: actualizar el token automáticamente
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 15:01:59 +02:00
Joan Sanchez d5ea45e36f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-04-18 13:14:57 +02:00
Joan Sanchez cdf092a989 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-04-18 11:52:17 +02:00
Joan Sanchez 32c9e22d96 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 11:41:55 +02:00
Alexandre Riera 2675c02d13 refs #5518 moved models to account
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 11:52:52 +02:00
Alexandre Riera ad3836552e refs #5518 sections added
gitea/salix/pipeline/head This commit looks good Details
2023-04-14 14:16:29 +02:00
Joan Sanchez 2e0325e567 Validate code
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 14:59:25 +02:00
Joan Sanchez d773837740 Removed user model
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-03 14:44:00 +01:00
Joan Sanchez 644d98ec1c syncUser() and setPassword() changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 07:32:38 +01:00
Joan Sanchez ee1ce21bb9 refactor(account): account model refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-23 15:24:00 +01:00
Alex Moreno 9eb3b09be1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head This commit looks good Details
2022-10-28 08:26:45 +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 c2d37dadf7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue 2022-10-14 08:01:06 +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
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
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