Commit Graph

6826 Commits

Author SHA1 Message Date
Alex Moreno b6778aaf17 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/pr-4774-traducciones This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-10-08 12:24:39 +02:00
Alex Moreno 3dad27e463 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-08 12:21:57 +02:00
Alex Moreno 6108a26e93 Merge pull request 'fix(VnPaginate): use default value' (!805) from hotFix_VnPaginate_offset 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: #805
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2024-10-08 10:19:32 +00:00
Alex Moreno d8a2cdc11c Merge branch 'master' into hotFix_VnPaginate_offset
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-08 10:16:14 +00:00
Carlos Satorres 68a54ebe22 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-08 09:26:35 +02:00
Carlos Satorres 0517b39c60 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-08 09:26:07 +02:00
Carlos Satorres 56fff55f71 fix: unnecessary property 2024-10-08 09:26:00 +02:00
Alex Moreno bde739e7ef Merge branch 'master' into hotFix_VnPaginate_offset
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-08 06:50:16 +00:00
Carlos Satorres 73e5039ec3 refs #7986 create front 2024-10-08 08:35:24 +02:00
Jorge Penadés 1723331615 Merge branch 'dev' of https: refs #7207//gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 16:35:00 +02:00
Jorge Penadés e6535a5dd8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8019-makeResponsiveInputs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 16:10:59 +02:00
Jorge Penadés 4344458bb0 feat: refs #8019 fine-tunning vnTime
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 16:02:29 +02:00
Jorge Penadés c815066953 feat: refs #8019 fine-tunning vnDate 2024-10-07 15:55:18 +02:00
Guillermo Bonet 26b4110d22 Merge pull request 'feat: refs #7893 Added waste recalc section' (!809) from 7893-wasteRecalc 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: #809
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-07 12:59:28 +00:00
Javier Segarra a0da1b3f46 Merge pull request 'HOTFIX: VnImg zoom resolution missing property' (!811) from hotfix_vnImg_zoom_resolution into master
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
Reviewed-on: #811
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-07 12:00:55 +00:00
Javier Segarra 43da6ea1b8 Merge branch 'master' into hotfix_vnImg_zoom_resolution
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-07 12:00:12 +00:00
Guillermo Bonet 50eed83d05 feat: refs #7893 Requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 13:50:19 +02:00
Jorge Penadés d1b3e01d87 chore: refs #8019 refactor css scoped
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 13:36:27 +02:00
Jon Elias 27dca7c35f Merge branch 'Fix-TicketsModule' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketsModule
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 13:29:46 +02:00
Jon Elias afc52f6cea fix: changes in sale and summary 2024-10-07 13:29:43 +02:00
Javier Segarra 0ed9fdd55d fix: refs VnImg zoom resolution missing property
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-07 13:02:40 +02:00
Carlos Satorres 51e8d37e4b Merge pull request 'hotfix: routePrice null' (!810) from hotfix-routePrice into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #810
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-07 10:37:11 +00:00
Carlos Satorres e396cd0cac hotfix: routePrice null
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-07 12:16:32 +02:00
Jorge Penadés d88fadca55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8019-makeResponsiveInputs 2024-10-07 11:47:39 +02:00
Guillermo Bonet a6944561de Merge branch 'dev' into 7893-wasteRecalc
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 11:32:03 +02:00
Guillermo Bonet c3eaab44ed Merge branch '7893-wasteRecalc' of https://gitea.verdnatura.es/verdnatura/salix-front into 7893-wasteRecalc
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 11:31:18 +02:00
Guillermo Bonet 178fa8cd21 feat: refs #7893 Requested changes 2024-10-07 11:31:16 +02:00
Alex Moreno b1385cf08a Merge pull request 'refactor(ticketNotes): translations' (!807) from fix_ticketNotes_translations 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: #807
Reviewed-by: Jon Elias <jon@verdnatura.es>
2024-10-07 08:09:12 +00:00
Guillermo Bonet f98739f0ed Merge branch 'dev' into 7893-wasteRecalc
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 08:03:26 +00:00
Guillermo Bonet 4f3e7e2630 feat: refs #7893 Added waste recalc section
gitea/salix-front/pipeline/pr-dev Build queued... Details
2024-10-07 10:03:05 +02:00
Carlos Satorres f22809d609 Merge pull request 'refs #6898 hotfix agency' (!808) from 6898-hotfixSupplierAgency into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #808
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-07 07:54:07 +00:00
Carlos Satorres 27e6dd5bf1 Merge branch 'master' into 6898-hotfixSupplierAgency
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-07 07:51:02 +00:00
Carlos Satorres 5d65d3e20c refs #6898 hotfix agency
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-07 09:48:57 +02:00
Jorge Penadés 5c5a359986 refactor: refs #8019 create VnTime 2024-10-07 09:38:39 +02:00
Jorge Penadés 947f913679 refactor: refs #8019 create VnDate 2024-10-07 09:25:06 +02:00
Alex Moreno 5af6c89c1a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into hotFix_VnPaginate_offset
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-07 09:17:19 +02:00
Alex Moreno ef5ae0f723 refactor(ticketNotes): translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 09:16:07 +02:00
Jon Elias 33d6d529c5 Merge branch 'dev' into Fix-TicketsModule
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 07:11:52 +00:00
Jon Elias bd3de77cbd fix: changes in list and filter to fix section
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 09:10:20 +02:00
Alex Moreno b8407140f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/pr-4774-traducciones This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-07 09:02:01 +02:00
Alex Moreno 426b7254d6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-07 09:01:57 +02:00
Jorge Penadés 120f96fedc Merge pull request '#7323 workerList' (!719) from 7323-fineTunningWorker into dev
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
gitea/salix-front/pipeline/pr-4774-traducciones This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #719
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-10-07 06:41:35 +00:00
Jorge Penadés 355c84ad06 Merge branch 'dev' into 7323-fineTunningWorker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 06:39:07 +00:00
Alex Moreno 9df5857b21 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-07 08:35:13 +02:00
Alex Moreno 34a40dd87c fix(VnPaginate): use default value
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-07 08:24:53 +02:00
Javier Segarra c9467b5286 Merge pull request 'Hotfix: zones and order filters, ticket transfer' (!799) from Hotfix-ZoneOrderFilters into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #799
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-10-05 09:02:46 +00:00
Javier Segarra 04b2a4d9ce perf: clean warnings
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-05 00:31:41 +02:00
Javier Segarra c3c2528342 feat: #7356 improve NotesSummary 2024-10-05 00:31:32 +02:00
Javier Segarra a69a4577a3 Merge pull request 'Fix:: order module' (!802) from Fix-OrderCatalog into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/pr-4774-traducciones This commit looks good Details
Reviewed-on: #802
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-10-04 17:48:47 +00:00
Pako Natek 355b1357b7 Merge branch 'dev' into Fix-OrderCatalog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-04 16:08:12 +00:00