Commit Graph

6842 Commits

Author SHA1 Message Date
Carlos Satorres 29770c57bd Merge pull request 'refs #6898 #6899 hotfix lists' (!826) from #6898-&-#6899-hotfixFilterList into master
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
Reviewed-on: #826
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-15 05:42:40 +00:00
Carlos Satorres 85eed86ba8 Merge branch 'master' into #6898-&-#6899-hotfixFilterList
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-15 05:41:32 +00:00
Jorge Penadés 523423cce6 Merge pull request '#7874 add observation type' (!765) from 7874-addObservationType into dev
gitea/salix-front/pipeline/pr-4774-traducciones This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #765
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-10-14 14:16:44 +00:00
Jorge Penadés 53fe6b0c3c Merge pull request 'fix: refs #7353 scopeDays' (!795) from 7353-hotfix-fixScopeDays into master
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #795
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-10-14 14:11:06 +00:00
Jorge Penadés 37dfca3bce Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixScopeDays
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-14 16:03:13 +02:00
Jorge Penadés 12e1d9c389 Merge pull request 'fix: refs #7524 dynamic fetch' (!828) from 7524-hotfix-dynamicFetch into master
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #828
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-10-14 14:02:02 +00:00
Jorge Penadés 1c7ec6af41 Merge branch '7353-hotfix-fixScopeDays' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixScopeDays
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-14 15:54:19 +02:00
Jorge Penadés 19545ca7e6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixScopeDays 2024-10-14 15:54:08 +02:00
Jorge Penadés 2d34921cf5 fix: refs #7524 paginate
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-14 15:52:12 +02:00
Jorge Penadés 245c027357 chore: refs #7874 refactor imports
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-14 15:43:59 +02:00
Javier Segarra 6633e65ee2 Merge branch 'dev' into 6943_customer_spec
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-14 12:35:51 +00:00
Jorge Penadés 0fb9b22935 chore: refs #7874 refactor code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-14 14:09:52 +02:00
Carlos Satorres 1a2c5c96fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7986-workerMoto
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-14 13:52:31 +02:00
Carlos Satorres 8258fbb91e refs #7767 remove onMounted
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-14 13:24:12 +02:00
Jorge Penadés 0f3168456a chore: refs #7524 sort by firstName
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-14 13:22:59 +02:00
Carlos Satorres b225f6a4c8 refs #7767 fix contractHolidays
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-14 13:18:34 +02:00
Jon Elias 1183d86867 Merge branch 'master' into Fix-InvoiceOutSummary
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-14 11:10:31 +00:00
Jon Elias 0aab17becc fix: fixed customer descriptor proxy
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-14 13:08:16 +02:00
Jorge Penadés 4ff3c18f33 feat: refs #7874 use badge type
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-14 13:00:15 +02:00
Jorge Penadés 6f2187cb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-14 12:18:37 +02:00
Jorge Penadés 4b78c1acd0 fix: refs #7524 dynamic
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-14 12:00:05 +02:00
Jon Elias 720042bed9 feat: added new filter param and refactored link colors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-14 11:30:31 +02:00
Javier Segarra 0fae36c239 Merge branch 'dev' into 7679_improve_newPostcode_form
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-14 09:01:15 +00:00
Jorge Penadés 12392444b9 Merge pull request '#8019 make responsive inputs' (!812) from 8019-makeResponsiveInputs into dev
gitea/salix-front/pipeline/pr-4774-traducciones This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #812
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-14 08:50:20 +00:00
Jorge Penadés fdbae5c0b5 Merge branch 'dev' into 8019-makeResponsiveInputs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-14 08:48:50 +00:00
Carlos Satorres 2edeb1043e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7767-holidayDaysExceeded
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-14 10:24:49 +02:00
Carlos Satorres 85b068eddb refs #6898 #6899 hotfix lists
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-14 10:21:02 +02:00
Alex Moreno 29651b425e Merge pull request 'refs: #6898 hotfix accounts' (!824) from 6898-fixSupplierAccounts into master
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #824
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-14 07:46:30 +00:00
Guillermo Bonet 787ce2fc48 feat: refs #7006 itemTypeLog added
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-14 09:33:00 +02:00
Carlos Satorres 6a624b12a5 refs: #6898 hotfix accounts
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-14 09:28:51 +02:00
Javier Segarra b6bce0c2f3 Merge branch 'dev' into 7679_improve_newPostcode_form
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-14 09:27:56 +02:00
Javier Segarra adbb745f0f Merge pull request 'Fix own test' (!816) from fix_test_jsegarra into dev
gitea/salix-front/pipeline/pr-4774-traducciones This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #816
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-14 07:24:16 +00:00
Javier Segarra 914f6022be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_test_jsegarra
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-14 09:23:31 +02:00
Alex Moreno 55b9fb1a87 Merge pull request 'fix: MyEntry e2e test' (!823) from Fix-EntryTest into dev
gitea/salix-front/pipeline/pr-4774-traducciones This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #823
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-14 07:10:20 +00:00
Jon Elias eebac7b36c fix: fixed e2e test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-14 08:51:26 +02:00
Jorge Penadés db5449444a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-14 08:37:44 +02:00
Alex Moreno 64c8d264af warmFix(TravelList): add daysOnward in travelFilter
gitea/salix-front/pipeline/pr-4774-traducciones This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-14 07:43:29 +02:00
Javier Segarra 3d9d08146c test: refs #6943 add customer test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-11 15:46:30 +02:00
Jorge Penadés 50042ed45b feat: refs #7874 prevent submit if empty fields
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-10 16:49:41 +02:00
Jorge Penadés 6d674f2a2b Merge branch 'dev' into 7874-addObservationType
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-10 13:41:01 +00:00
Javier Segarra f72761f36c Merge pull request '#7404 - Rollback Style to compress spaces' (!820) from revert_css_styles into dev
gitea/salix-front/pipeline/pr-4774-traducciones This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #820
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-10 12:29:40 +00:00
Javier Segarra 2ff99d3faa feat: define as global dense value
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-10 13:56:14 +02:00
Javier Segarra 3dfb836f8e revert: rollback compress spacestyle 2024-10-10 13:56:11 +02:00
Jorge Penadés 5af14b1b52 chore: refs #7874 fix test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-10 12:12:03 +02:00
Jorge Penadés 44c4c378f9 chore: refs #7874 add default ob type
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-10 11:02:03 +02:00
Javier Segarra 09d40b844c Merge pull request 'fix: Use geoFk for ZoneDeliveryPanel' (!819) from hotfix_zoneDeliveryPanel into master
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #819
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-10-10 08:33:58 +00:00
Jon Elias 8b68c0afeb fix: improve geoFk for ZoneDeliveryPanel
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-10 08:30:56 +00:00
Jorge Penadés 830decb6db Merge branch 'dev' into 7874-addObservationType
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-10 08:16:36 +00:00
Jon Elias e58818e891 fix: Use geoFk for ZoneDeliveryPanel
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-10 08:14:24 +00:00
Jorge Penadés 9c6b4f28d7 Merge pull request '#7524 use dynamic load' (!818) from 7524-hotfix-dynamicFetch into master
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #818
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-10-10 08:00:56 +00:00