wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
6,439 Commits 155 Branches 0 Tags 21 MiB
Commit Graph

6439 Commits

Author SHA1 Message Date
Alex Moreno 64c8d264af warmFix(TravelList): add daysOnward in travelFilter 2024-10-14 07:43:29 +02:00
Javier Segarra f72761f36c Merge pull request '#7404 - Rollback Style to compress spaces' (!820) from revert_css_styles into dev 
Reviewed-on: verdnatura/salix-front#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 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 480f243205 Merge pull request 'feat: refs #7207 show queue' (!748) from 7207-showPbx into dev 
Reviewed-on: verdnatura/salix-front#748
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-10 07:20:25 +00:00
Jorge Penadés 00dc2c6edc Merge branch 'dev' into 7207-showPbx 2024-10-10 07:18:00 +00:00
Alex Moreno b6778aaf17 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-08 12:24:39 +02:00
Alex Moreno 3dad27e463 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 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 
Reviewed-on: verdnatura/salix-front#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 2024-10-08 10:16:14 +00:00
Carlos Satorres 68a54ebe22 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-08 09:26:35 +02:00
Carlos Satorres 0517b39c60 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front 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 2024-10-08 06:50:16 +00:00
Jorge Penadés 1723331615 Merge branch 'dev' of https: refs #7207//gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx 2024-10-07 16:35:00 +02:00
Guillermo Bonet 26b4110d22 Merge pull request 'feat: refs #7893 Added waste recalc section' (!809) from 7893-wasteRecalc into dev 
Reviewed-on: verdnatura/salix-front#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 
Reviewed-on: verdnatura/salix-front#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 2024-10-07 12:00:12 +00:00
Guillermo Bonet 50eed83d05 feat: refs #7893 Requested changes 2024-10-07 13:50:19 +02:00
Javier Segarra 0ed9fdd55d fix: refs VnImg zoom resolution missing property 2024-10-07 13:02:40 +02:00
Carlos Satorres 51e8d37e4b Merge pull request 'hotfix: routePrice null' (!810) from hotfix-routePrice into master 
Reviewed-on: verdnatura/salix-front#810
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-07 10:37:11 +00:00
Carlos Satorres e396cd0cac hotfix: routePrice null 2024-10-07 12:16:32 +02:00
Guillermo Bonet a6944561de Merge branch 'dev' into 7893-wasteRecalc 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 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 
Reviewed-on: verdnatura/salix-front#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 2024-10-07 08:03:26 +00:00
Guillermo Bonet 4f3e7e2630 feat: refs #7893 Added waste recalc section 2024-10-07 10:03:05 +02:00
Carlos Satorres f22809d609 Merge pull request 'refs #6898 hotfix agency' (!808) from 6898-hotfixSupplierAgency into master 
Reviewed-on: verdnatura/salix-front#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 2024-10-07 07:51:02 +00:00
Carlos Satorres 5d65d3e20c refs #6898 hotfix agency 2024-10-07 09:48:57 +02:00
Alex Moreno 5af6c89c1a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into hotFix_VnPaginate_offset 2024-10-07 09:17:19 +02:00
Alex Moreno ef5ae0f723 refactor(ticketNotes): translations 2024-10-07 09:16:07 +02:00
Alex Moreno b8407140f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 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 
Reviewed-on: verdnatura/salix-front#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 2024-10-07 06:39:07 +00:00
Alex Moreno 9df5857b21 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-07 08:35:13 +02:00
Alex Moreno 34a40dd87c fix(VnPaginate): use default value 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 
Reviewed-on: verdnatura/salix-front#799
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-05 09:02:46 +00:00
Javier Segarra 04b2a4d9ce perf: clean warnings 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 
Reviewed-on: verdnatura/salix-front#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 2024-10-04 16:08:12 +00:00
Jorge Penadés 9383a71adb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx 2024-10-04 16:38:27 +02:00
Jon Elias aee23c75e8 fix: order module 2024-10-04 14:31:39 +02:00
Jon Elias e4e60abe0e Merge branch 'master' into Hotfix-ZoneOrderFilters 2024-10-04 12:25:49 +00:00
Jon Elias 3a21f6aadb fix: order catalog 2024-10-04 14:22:00 +02:00
Pablo Natek d325459beb Merge pull request '4988-fixE2e' (!801) from 4988-fixE2e into dev 
Reviewed-on: verdnatura/salix-front#801
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-04 12:18:52 +00:00
Jorge Penadés 905841e0d6 Merge branch 'dev' into 7207-showPbx 2024-10-04 11:45:28 +00:00