Commit Graph

17289 Commits

Author SHA1 Message Date
Juan Ferrer c5d2e87cb1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 09:09:38 +02:00
Juan Ferrer a67cd5ba64 refs #5900 User avatar with sticky position 2023-06-28 09:09:36 +02:00
Carlos Satorres d32563eec7 refs #5660 delivery
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 08:37:30 +02:00
Carlos Satorres 68b65105fd refs #5660 role mod
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 08:02:31 +02:00
Alex Moreno 9b0cf7f378 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-06-28 07:20:12 +02:00
Alex Moreno 31d637c8a7 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-28 07:19:04 +02:00
Alex Moreno 162faf0d01 Merge branch '5475-email_2fa' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-06-28 07:18:10 +02:00
Carlos Satorres 06437c9e80 refs #5334 remove other
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 07:02:59 +02:00
Alex Moreno 4b8b7a9d82 refs #5475 fix accessScope
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-27 15:30:54 +02:00
Alex Moreno f8a972c2f2 refs #5094 fix translation
gitea/salix/pipeline/head This commit looks good Details
2023-06-27 14:48:22 +02:00
Alex Moreno 0a0d16bfea Merge branch 'dev' into 5640-mayusFiscalDate
gitea/salix/pipeline/head This commit looks good Details
2023-06-27 11:51:11 +00:00
Alex Moreno fe53abb24f Merge pull request 'fix warn' (!1641) from warnFix_travel_summary_entry into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1641
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-27 11:49:29 +00:00
Carlos Satorres 07712f58e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-06-27 13:36:51 +02:00
Carlos Satorres eaf3f5e3ea refs #5660 change sql
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-27 13:17:00 +02:00
Carlos Satorres a930963ef9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-06-27 12:34:37 +02:00
Carlos Satorres f0b238b62a refs #5836 fix e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-27 12:31:58 +02:00
Carlos Satorres 7e542f93a1 Merge branch 'test' into warnFix_travel_summary_entry
gitea/salix/pipeline/head This commit looks good Details
2023-06-27 10:11:59 +00:00
Carlos Satorres 8e5a6dbab3 fix warn
gitea/salix/pipeline/head This commit looks good Details
2023-06-27 11:44:23 +02:00
Vicent Llopis 87c233d221 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5808-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-27 10:33:15 +02:00
Carlos Satorres 5216f12001 refs #5836 check fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-27 10:27:39 +02:00
Alex Moreno 1cf5ff9a62 refs #5554 new Date()
gitea/salix/pipeline/head This commit looks good Details
2023-06-27 08:24:31 +02:00
Alex Moreno 46ffd8d95a refs #5554 console.log
gitea/salix/pipeline/head This commit looks good Details
2023-06-27 08:07:54 +02:00
Carlos Satorres 549235429c refs #5640 oldBranch
gitea/salix/pipeline/head This commit looks good Details
2023-06-27 07:18:36 +02:00
Alex Moreno e43e52b561 refs #5753 db export and fix fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-26 15:21:45 +02:00
Carlos Satorres 24ea18aeb0 refs #5836 isworker back
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 13:55:39 +02:00
Carlos Satorres 15e39b5fec Merge pull request 'change applyFilters' (!1636) from hotfix-filterScopeDays into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1636
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-26 11:12:33 +00:00
Carlos Satorres 878e9c4fe9 Merge branch 'hotfix-filterScopeDays' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-filterScopeDays
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 12:32:11 +02:00
Carlos Satorres de62dd9ffd refs # e2e fix 2023-06-26 12:32:08 +02:00
Alex Moreno 15c45bb544 Merge branch 'test' into hotfix-filterScopeDays
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 10:30:57 +00:00
Carlos Satorres 7d2076ff90 Merge pull request '232402_test_to_dev' (!1637) from 232402_test_to_dev into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1637
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>
2023-06-26 10:10:53 +00:00
Alex Moreno 224a44847d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 11:56:07 +02:00
Alex Moreno ecf742959c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 11:55:28 +02:00
Alex Moreno ef8e1c4169 refs #5531 refs #5753 fix travelConfig sql
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 10:57:12 +02:00
Juan Ferrer e980717d14 refs #5900, #5772 Changelog updated
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-26 10:56:53 +02:00
Carlos Satorres 88e845b511 change applyFilters
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 10:49:09 +02:00
Juan Ferrer c42b38c5cc refs #5900 Code clean, refactor & accurated
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 10:23:34 +02:00
Guillermo Bonet e54e0784bf Merge branch '5816-noCreateLog' into 5900-removeDuplicatedLogs
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 10:06:41 +02:00
Guillermo Bonet cc5021a75f refs #5684 Removed xxxLog.create and dependences
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-26 09:40:55 +02:00
Alex Moreno 798481b24a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-06-26 07:53:44 +02:00
Carlos Satorres eff46c1cec refs #5066 e2e fix, vnConfig
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 07:43:36 +02:00
Carlos Satorres dcbe8c5f7a refs #5066 quit if
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 06:28:35 +02:00
Carlos Satorres abfe012a78 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted 2023-06-26 06:12:22 +02:00
Juan Ferrer 630ce40ef7 Merge branch 'test' into 5900-removeDuplicatedLogs
gitea/salix/pipeline/head This commit looks good Details
2023-06-25 20:00:02 +02:00
Juan Ferrer 544445c4ae refs #5800 Origin separator style more clear
gitea/salix/pipeline/head This commit looks good Details
2023-06-25 19:52:14 +02:00
Juan Ferrer d69cbe0ad4 refs #5900 Origin separator style fix
gitea/salix/pipeline/head This commit looks good Details
2023-06-25 19:39:27 +02:00
Juan Ferrer e32a29fc09 refs #5900 Remove duplicated logs
gitea/salix/pipeline/head This commit looks good Details
2023-06-25 19:08:13 +02:00
Juan Ferrer efe0966069 refs #5900 Removed code to split user changes based on date
gitea/salix/pipeline/head This commit looks good Details
2023-06-25 19:01:46 +02:00
Juan Ferrer c15d9a4753 refs #5900 Log order fix
gitea/salix/pipeline/head This commit looks good Details
2023-06-25 18:49:38 +02:00
Juan Ferrer 631c0e3121 refs #5900 Log grouping fix
gitea/salix/pipeline/head This commit looks good Details
2023-06-25 18:09:28 +02:00
Juan Ferrer fd69d69ff0 refs #5900 Style: margin adjustments
gitea/salix/pipeline/head This commit looks good Details
2023-06-25 17:40:09 +02:00