Commit Graph

541 Commits

Author SHA1 Message Date
Guillermo Bonet 9b80ef73a8 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-14 12:48:00 +02:00
Carlos Satorres 189c67bd2d warmFix change if
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-14 09:43:10 +02:00
Jon Elias 61a588b57c refactor: refs #6436 fixed test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-14 08:39:57 +02:00
Jorge Penadés 784bd91e04 fix: refs #6286 update WorkerTimeControl permissions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-13 13:43:28 +02:00
Jorge Penadés 7480f5ecb3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 16:54:03 +02:00
Jon Elias 84a51d3e8d feat: refs #6436 changed tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 12:23:37 +02:00
Jon Elias 944355d54f refactor: refs #6436 end first wave of changes in modules
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 13:17:19 +02:00
Jon Elias 7df7382346 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 09:41:26 +02:00
Jon Elias f0ad012835 refactor: refs #6436 first wave 2024-06-11 09:39:06 +02:00
Jorge Penadés 479e4f3f8a feat: refs #6273 required payMethod for internals
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-07 13:55:56 +02:00
Jorge Penadés 310c2383cb fix: refs #6286 replace id for reason
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-07 09:08:21 +02:00
Jorge Penadés 1912fdd45d refactor: refs #6286 replace name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-06 17:26:23 +02:00
Jorge Penadés 14afd8246a feat: refs #6273 add back test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 17:38:48 +02:00
Jorge Penadés 8188bdbcb0 fix: refs #6273 use userId
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 17:12:37 +02:00
Jorge Penadés a79285cd3d feat: refs #6273 register freelance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 16:27:00 +02:00
Pablo Natek 4cf5457690 fix: refs #7187 remove focus on spec
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 14:01:41 +02:00
Pablo Natek 1abacdc42b fix: refs #7187 method
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 14:00:42 +02:00
Pablo Natek b41104432c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 13:57:55 +02:00
Pablo Natek bcb3ea4837 feat: refs #7187 new method available pda
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 10:23:33 +02:00
Carlos Satorres 0f52fe65d3 refs #7360 fix error weekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 09:46:40 +02:00
Carlos Satorres 7b298c1baf refs #6882 fix tback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 12:24:05 +02:00
Carlos Satorres 8a7d124066 refs #6882 fix traductions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 12:17:44 +02:00
Carlos Satorres 0709a64dca refs #6882 fix back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 12:05:47 +02:00
Carlos Satorres c355595384 refs #6882 fix back, tback te2e 2024-05-08 11:47:04 +02:00
Carlos Satorres 8637488fc1 refs #6882 fix pr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 08:48:19 +02:00
Carlos Satorres fe300f0f24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-06 09:26:14 +02:00
Pablo Natek 4c55ae40ef Merge pull request 'test' (!2402) from test into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2402
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-03 10:58:42 +00:00
Pablo Natek 3ae192c761 fix: refs #6005 fix test 2024-05-03 12:52:12 +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
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
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
Javier Segarra 322d91d814 feat(salix): refs #6930 Add DEFAULT scope 2024-04-19 10:49:57 +02:00
Javier Segarra 6214da2c42 feat(salix): refs #6930 Undo rollback salix-back 2024-04-17 09:52:53 +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
Pablo Natek c581deef66 refactor: refs #6005 refactor spec 2024-04-10 13:09:31 +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
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
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
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 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 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
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 4490dc7bee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch 2024-02-01 08:15:15 +01:00
Guillermo Bonet 851e5cc5af refactor: refs #6235 Fixed tests back 2024-01-31 13:16:56 +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
Jorge Penadés ed77347fe1 fix: #6557 replace procedure
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-25 15:41:55 +01:00
Pablo Natek 3848503853 fix(test): refs #6743 exportDb
gitea/salix/pipeline/head This commit looks good Details
2024-01-25 14:58:48 +01:00
Alex Moreno ee6fe5a6e1 Merge branch 'dev' into 6667-searchFilter
gitea/salix/pipeline/head This commit looks good Details
2024-01-22 07:02:51 +00:00
Carlos Satorres 0f104e5410 refs #6667 view workerDepartment
gitea/salix/pipeline/head This commit looks good Details
2024-01-19 10:11:33 +01:00
Carlos Satorres ccdef0458a refs #6667 fix groupBy
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 14:39:11 +01:00
Carlos Satorres d1a3c67d2e refs #6667 fix limit
gitea/salix/pipeline/head This commit looks good Details
2024-01-17 14:07:04 +01:00
Carlos Satorres d47429b4a7 refs #6667 sql
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 10:01:38 +01:00
Guillermo Bonet 2f67056dbf Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-01-17 09:44:32 +01:00
Guillermo Bonet 5bbeda4014 feat: refs #4734 Added viaexpress interdia
gitea/salix/pipeline/head This commit looks good Details
2024-01-16 13:05:16 +01:00
Alex Moreno c20b9fe212 refs #6656 fix(updateTimeEntry): correct accessType (WRITE)
gitea/salix/pipeline/head This commit looks good Details
2024-01-15 07:45:40 +01:00
Alex Moreno 199656afb8 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-01-12 12:41:52 +01:00
Jorge Penadés 2a6b509a78 fix: refs #6656 change acls
gitea/salix/pipeline/head This commit looks good Details
2024-01-12 09:54:18 +01:00
Alex Moreno edde5819e3 refs #6660 feat: update mariadb version 10.7.7→10.11.6
gitea/salix/pipeline/head This commit looks good Details
2024-01-10 15:39:35 +01:00
Javier Segarra 4d7f0329ee Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 12:46:26 +00:00
Guillermo Bonet a6ebd01ebd Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 13:28:23 +01:00
Jorge Penadés 5dc49d226a refs #6274 fix locale
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 10:13:56 +01:00