Commit Graph

1129 Commits

Author SHA1 Message Date
Pablo Natek 6152820078 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6005-fix-runtime-error 2024-05-03 12:47:14 +02:00
Pablo Natek 48bfba71de fix: refs #6005 runtime
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-03 12:33:59 +02:00
Carlos Satorres f77cf619db refs #6682 holidays conditional
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-03 12:27:19 +02:00
Pablo Natek 8b11a4a290 fix: refs #6005 time issue
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-03 12:08:22 +02:00
Robert Ferrús 82ee8d2209 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 09:25:06 +00:00
Jorge Penadés 63655a4dd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-02 08:58:51 +02:00
Guillermo Bonet 110cae3171 Merge pull request 'refactor: #6997 Deleted vn.client.eypbc' (!2353) from 6997-eypbc into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2353
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-30 08:23:52 +00:00
Jorge Penadés be69b5e2c4 fix: refs #5919 rollback 2024-04-29 12:04:31 +02:00
Jorge Penadés f6e89c9049 fix: refs #5919 rollback 2024-04-29 11:46:58 +02:00
Jorge Penadés 7240269f5b fix: refs #5919 rollback 2024-04-29 11:45:54 +02:00
Jorge Penadés 50ea41f99a fix: refs #5919 rollback 2024-04-29 11:43:56 +02:00
Jorge Penadés 8adb52aac4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-04-29 09:24:10 +02:00
Robert Ferrús 2d0d4b5643 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 06:48:01 +00:00
Jorge Penadés 180a484c55 fix: refs #7211 rollback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 16:14:34 +02:00
Jorge Penadés f7cdbd39f0 fix: refs #7211 tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 16:08:52 +02:00
Robert Ferrús 8153a526ce feat: refs #7039 country-name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 12:35:21 +02:00
Jorge Penadés c9dfccbc53 feat: refs #7211 add test & changelog
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 09:35:53 +02:00
Guillermo Bonet 1044a24bc7 refactor: #6997 Deleted vn.client.eypbc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 12:00:23 +02:00
Javier Segarra f6199f8f8e Actualizar modules/worker/back/models/worker.json
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 06:56:05 +00:00
Javier Segarra 283d27e1c5 Actualizar modules/worker/back/models/worker.json
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 06:22:36 +00:00
Javier Segarra b4503afc47 Merge branch 'dev' into 6930_scope_Default_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-19 10:50:45 +02:00
Javier Segarra 30d0db163e feat(salix): refs #6930 minor updates 2024-04-19 10:50:14 +02:00
Javier Segarra 322d91d814 feat(salix): refs #6930 Add DEFAULT scope 2024-04-19 10:49:57 +02:00
Alex Moreno 5b5ec11973 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-19 08:58:17 +02:00
Alex Moreno 87e23b49e7 hotFix: change require to import
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-18 15:19:19 +02:00
Alex Moreno 9143447eb8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-18 09:27:46 +02:00
Alex Moreno af06ef30d4 hotFix(workerDms): document.isDocuware
gitea/salix/pipeline/head This commit looks good Details
2024-04-18 08:50:17 +02:00
Javier Segarra 6214da2c42 feat(salix): refs #6930 Undo rollback salix-back 2024-04-17 09:52:53 +02:00
Jorge Penadés 3c9ac9634b fix: refs #6938 front tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 15:02:45 +02:00
Jorge Penadés 3e1218463c fix: refs #6938 filters & scope
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-15 14:44:18 +02:00
Jorge Penadés d7b06fe637 fix: refs #6938 scope
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 12:47:27 +02:00
Jorge Penadés 200cbd8d74 fix: refs #6938 acls & scope
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 11:03:57 +02:00
Jorge Penadés a68b8431c5 feat: refs #6938 add scope & acls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 10:21:59 +02:00
Pablo Natek 726b1ddc07 Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-12 05:14:29 +00:00
Alex Moreno 3635a4b6d0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-11 07:46:16 +02:00
Pablo Natek c581deef66 refactor: refs #6005 refactor spec 2024-04-10 13:09:31 +02:00
Alex Moreno 51e7045e8b hotFix(workerTimeControl): getWeekNumber
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-10 09:44:09 +02:00
Pablo Natek ed517399dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler 2024-04-09 15:04:04 +02:00
Pablo Natek ac9732606c remove(focus): refs #6005 from spec 2024-04-09 14:55:29 +02:00
Ivan Mas f02c4354ba Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 14:45:29 +02:00
Pablo Natek da037c5235 refactor: refs #6005 delay on productionConfig 2024-04-09 13:34:33 +02:00
Carlos Satorres de75d811c3 refs #6682 absence
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-09 12:30:25 +02:00
Pablo Natek 7cb40f5d89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-09 09:42:39 +02:00
Pablo Natek 638b715ee5 fix: refs #6005 move logic to hook
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-09 09:30:28 +02:00
Alex Moreno 500244dbed fix id
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 07:51:57 +02:00
Alex Moreno 9134216332 refactor(workerDms): adapat to lilium
gitea/salix/pipeline/pr-dev Build queued... Details
2024-04-08 14:46:35 +02:00
Pablo Natek 4b4aaa9e10 feat: refs #6005 move logic from report to hook 2024-04-05 08:04:53 +02:00
Guillermo Bonet c685000b47 hotfix: refs #6930 Rollback tokenMultimedia
gitea/salix/pipeline/head This commit looks good Details
2024-04-04 10:13:56 +02:00
Jorge Penadés e7a29119d0 feat: refs #7002 add test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 13:38:04 +01:00
Jorge Penadés 6ded14b593 feat: refs #7002 update direction if it was not manual
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-26 14:25:25 +01:00
Jorge Penadés eb2b0d41de feat: refs #7002 update direction if device exists
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-25 13:33:39 +01:00
Ivan Mas db71e69317 Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 09:21:32 +00:00
Jorge Penadés 6281ba352b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 10:38:08 +01:00
Javier Segarra 6989299593 Merge branch 'dev' into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 08:26:45 +00:00
Pablo Natek e3b7c7bb60 Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 09:39:13 +00:00
Pablo Natek 8815f07850 feat(spec): refs #6005 add spec to backup Notify
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 12:18:03 +01:00
Pablo Natek ae25ba3fb6 feat(notify): refs #6005 add restriction on created notification time
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-08 13:44:19 +01:00
Pablo Natek 2421cc7c68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-08 08:23:08 +01:00
Jorge Penadés a94fd1a61c fix: refs #6744 change error kind
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 09:29:51 +01:00
Jorge Penadés 05f3a3f31b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 08:43:01 +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
Javier Segarra 6c06f70121 Merge branch 'dev' into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 18:18:34 +00:00
Ivan Mas 10a89cb790 refs #6827 Check usernames special characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-28 13:32:17 +01:00
Sergio De la torre 96abdd4630 refs #6078 feat:add workeractivity 2024-02-26 12:52:34 +01:00
Javier Segarra 04086e37ee refs #6930 feat: add accessScopes: ['read:multimedia'] forEarch method
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 06:57:17 +01:00
Jorge Penadés 70c400c5f9 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-23 12:51:22 +01:00
Jorge Penadés 3bf25e5759 fix: refs #6744 locale
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 09:31:01 +01:00
Jorge Penadés 625c498f26 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 09:18:45 +01:00
Alex Moreno 0ad3abcea3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-23 08:39:54 +01:00
Alex Moreno 1d4c48e149 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-23 08:39:26 +01:00
Alex Moreno 607b908814 Merge branch 'dev' into 6414-fix_backTest_newWorker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 06:41:36 +00:00
Alex Moreno c7dd81e53d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev Build started... Details
2024-02-23 07:12:24 +01:00
Jorge Penadés 744dd61561 fix: refs #6744 create setUnverifiedPassword
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 15:42:54 +01:00
Carlos Satorres fac7071bae refs #6414 fix(newWorker): back test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 14:38:26 +01:00
Jorge Penadés 168e8ca205 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-22 13:21:46 +01:00
Jorge Penadés 76b1433099 fix: refs #6878 use clockIn procedure on update time
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-22 12:48:07 +01:00
Alex Moreno 60dfe8ec05 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_master24_8
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-21 15:12:48 +01:00
Alex Moreno 01f1bd0088 Revert "Merge branch 'dev' into test"
gitea/salix/pipeline/pr-test This commit looks good Details
This reverts commit c4a64b93cc, reversing
changes made to 2ab1cebb31.
2024-02-21 14:44:34 +01:00
Pablo Natek 5e97f820a2 feat(spec): refs #6005 add spec
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 12:59:42 +01:00
Alex Moreno 7fbb9b5c3f Merge branch 'master' into hotFix_workerTimeControl_reUse_hasToRefill
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-20 11:15:16 +00:00
Alex Moreno ab9c952afc hotFix(sendMail): hasToRefill
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-20 12:13:49 +01:00
Carlos Satorres f3511d4a43 refs #6414 tback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 09:53:28 +01:00
Pablo Natek ab7eb88913 merge(dev): refs #6005 merge dev
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 09:34:08 +01:00
Jorge Penadés d5a3413307 fix: refs #6776 method names & chanmges
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 14:46:42 +01:00
Pablo Natek 7b0dd6975d fix(usesMana): refs #6879 add mana excluded worker
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-02-19 14:13:36 +01:00
Alex Moreno 231ebf78d7 hotFix: remove console.log
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-19 12:33:33 +01:00
Alex Moreno 8328dd6f4c hotFix: workerTimeControl use department.hasToRefill 2024-02-19 12:31:14 +01:00
Jorge Penadés 9f2768c131 fix: refs #6776 tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 15:51:54 +01:00
Carlos Satorres 59ea47a8c3 refs #6414 tback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 13:06:33 +01:00
Jorge Penadés 47bfb34507 fix: refs #6744 remove params
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-13 10:10:48 +01:00
Jorge Penadés 7b862c5c30 fix: refs #6744 fix setPassword
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-12 16:10:58 +01:00
Jorge Penadés 2940c68516 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-08 08:36:05 +01:00
Jorge Penadés 21cf05ddd0 fix: refs #6276 fix tests & errors
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-02 09:23:29 +01:00
Jorge Penadés ec7a88c6dd fix: refs #6703 tests, backs & fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-01 12:56:11 +01:00
Jorge Penadés 4490dc7bee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch 2024-02-01 08:15:15 +01:00
Jorge Penadés c4161eec97 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-02-01 08:14:37 +01:00
Guillermo Bonet 851e5cc5af refactor: refs #6235 Fixed tests back 2024-01-31 13:16:56 +01:00
Jorge Penadés 8f5a5d9cba fix: refs #6703 tests & backs 2024-01-31 13:11:15 +01:00
Guillermo Bonet dd17b2c05d feat: refs #6235 Added device in clockIn 2024-01-31 09:04:30 +01:00
Jorge Penadés 9e12bdf4e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 08:49:28 +01:00