Commit Graph

1174 Commits

Author SHA1 Message Date
Jorge Penadés f39595087a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-03-14 15:00:16 +01:00
Kevin Martinez 8587d46943 Merge branch 'salix-dev' into feature/route-module
gitea/salix-front/pipeline/pr-dev This commit looks good Details
# Conflicts:
#	src/pages/Route/Card/RouteSummary.vue
2024-03-14 08:05:51 -03:00
Jorge Penadés 0c012ed71a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-14 08:54:21 +01:00
Alex Moreno 7a75238695 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-03-14 08:16:15 +01:00
William Buezas f26d14e875 resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-13 12:57:41 -03:00
Javi Gallego 4bc57d0287 Merge branch 'dev' into CambiosSolicitadosSuppliers
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-13 14:37:06 +00:00
Jorge Penadés e793b3dd93 feat: refs #5186 use global locales
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-13 15:06:02 +01:00
Kevin Martinez 77e29a2b87 Fix tickets feedback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-12 21:26:17 -03:00
Kevin Martinez e4553659cf Update translation from population to city
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-12 21:23:46 -03:00
William Buezas ff0b0c8131 Remove innecesary prop
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-12 12:38:44 -03:00
William Buezas 632049c13b Assign button change
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-12 11:31:32 -03:00
William Buezas 433843ea09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into CambiosSolicitadosSuppliers
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-12 08:16:40 -03:00
William Buezas dad2711311 fix translation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-12 08:13:27 -03:00
William Buezas 319295f2c2 Workers PDA
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-11 16:53:33 -03:00
Jorge Penadés b44dcdb28a fix: refs #5186 tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-11 15:17:49 +01:00
Jorge Penadés 37f155aa85 fix: refs #5186 css, required files & routes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-11 10:06:11 +01:00
Jorge Penadés 33ef118dea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-11 09:32:30 +01:00
William Buezas 9ced305797 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into EntryLatestBuysFilters
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-08 09:03:33 -03:00
Pablo Natek e5e0d8f806 Merge branch 'dev' into 6349-removeRma
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-08 07:08:36 +00:00
Kevin Martinez 1ab9bfefed Centralize roadmap add stop form
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-07 20:37:14 -03:00
Jorge Penadés d8a0adb852 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-07 15:57:54 +01:00
Javier Segarra baf01f6720 Merge branch 'test' into 6940_hotFix_cmrFilterPanel
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-03-07 12:53:00 +00:00
Guillermo Bonet 61f13861f8 Merge branch 'dev' into 6948-bank
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-07 06:17:20 +00:00
Kevin Martinez e8e2bc8403 Fix route list worker field
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 23:25:41 -03:00
Kevin Martinez d3a93da849 Merge branch 'salix-dev' into feature/route-module
gitea/salix-front/pipeline/pr-dev This commit looks good Details
# Conflicts:
#	src/components/ui/VnPaginate.vue
2024-03-06 23:19:47 -03:00
Kevin Martinez 7974725da0 Fix with feedback
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-03-06 23:15:26 -03:00
William Buezas 44d7f98cdc Add item descriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 18:22:15 -03:00
William Buezas a828ac5954 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into EntryLatestBuysFilters 2024-03-06 18:08:02 -03:00
Pablo Natek 00df197653 Merge branch 'dev' into 6486-fix-TicketHeaders
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 13:27:52 +00:00
Pablo Natek 70dc144019 fix(ticket): refs #6486 add a and style to card headers
gitea/salix-front/pipeline/pr-dev Build queued... Details
2024-03-06 14:28:33 +01:00
Alex Moreno 4443edd800 fix(claimSummary) header color
gitea/salix-front/pipeline/head This commit looks good Details
2024-03-06 13:45:02 +01:00
William Buezas 6a105d5d38 resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 08:35:49 -03:00
Guillermo Bonet aa59643cf3 Merge branch 'dev' into 6948-bank
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 10:18:49 +00:00
Javier Segarra 7e769164d7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-refactor-claimSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 09:48:34 +01:00
Pablo Natek 1aedb3c7da Merge branch 'dev' into 6486-salixColors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 08:43:21 +00:00
Pablo Natek 0192ec344f Merge branch '6486-salixColors' of https://gitea.verdnatura.es/verdnatura/salix-front into 6486-salixColors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 09:43:45 +01:00
Pablo Natek b584295101 fix: refs #6486 add title to basicData 2024-03-06 09:43:45 +01:00
Pablo Natek 28b63831cc Merge branch 'dev' into 6486-salixColors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 08:41:49 +00:00
Carlos Satorres 207b95c0e9 Merge branch 'dev' into 6892-summaryCardRefact
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 08:40:46 +00:00
Pablo Natek 59d41029d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6486-salixColors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 09:39:56 +01:00
Carlos Satorres 366ed0974a Merge branch 'dev' into 6935-cardDescriptorRemake
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 08:39:19 +00:00
Javier Segarra 4637053ab2 refs #6336 feat: useCardSize
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-03-06 09:35:01 +01:00
Alex Moreno 973a6eb58c Merge branch 'dev' into 6935-cardDescriptorRemake
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 08:30:43 +00:00
Jorge Penadés de294fae9c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 08:52:54 +01:00
Kevin Martinez 5ddae1fe65 Fix route basic data
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-05 10:56:18 -03:00
Carlos Satorres 65f1d56d5b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6892-summaryCardRefact
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-05 14:47:42 +01:00
Carlos Satorres ed44d96589 refs #6892 fix checkbox
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 14:45:13 +01:00
William Buezas 052123ad0e Change currentSupplier variable name
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-05 09:58:54 -03:00
William Buezas 6969daf90f Revert "Add links to invoice out summary table"
This reverts commit b010f8ec3e.
2024-03-05 09:18:10 -03:00
William Buezas b010f8ec3e Add links to invoice out summary table 2024-03-05 09:17:09 -03:00