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

5114 Commits

Author SHA1 Message Date
Javier Segarra 532306c4ef Merge branch 'dev' into 7790_formFocus_mixin 2024-10-11 16:09:47 +02: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 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 d8a2cdc11c Merge branch 'master' into hotFix_VnPaginate_offset 2024-10-08 10:16:14 +00: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
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 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
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 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 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 355c84ad06 Merge branch 'dev' into 7323-fineTunningWorker 2024-10-07 06:39:07 +00:00
Alex Moreno 34a40dd87c fix(VnPaginate): use default value 2024-10-07 08:24:53 +02: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
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
Jorge Penadés 905841e0d6 Merge branch 'dev' into 7207-showPbx 2024-10-04 11:45:28 +00:00
Jorge Penadés b735ccb3a0 Merge branch 'dev' of https: refs #7323//gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-10-04 13:37:55 +02:00
Pablo Natek efe5208d30 Merge branch 'dev' into 4988-fixE2e 2024-10-04 11:32:40 +00:00
Pablo Natek 1869e3315a fix: refs #4988 remove id 2024-10-04 13:14:14 +02:00
Pablo Natek 7dc019cfbb fix: refs #4988 selector on e2e 2024-10-04 13:13:57 +02:00
Jon Elias 195747b5a0 feat: added click and transfer tickets and deleted useless code 2024-10-04 12:34:37 +02:00
Jorge Penadés 67c2e284ba feat: refs #7702 ask old pass 2024-10-04 11:45:10 +02:00
Jorge Penadés e43ba9b58a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword 2024-10-04 10:11:38 +02:00
Jon Elias 7874db1647 fix: zone delivery postcodes filter and order catalog type filter 2024-10-04 09:58:23 +02:00
Pablo Natek 4ba52f1a56 Merge branch 'dev' into 7404-addSomeLogisticPreferences 2024-10-04 06:55:41 +00:00
Pablo Natek 4a357c5be6 Merge branch 'dev' into 7404-addSomeLogisticPreferences 2024-10-04 06:53:53 +00:00
Pablo Natek 99ba7a39fa Merge branch 'dev' into 7129--fixTranslates 2024-10-04 06:53:17 +00:00
Carlos Satorres 530ed4b716 refs #7355 fix searchbar 2024-10-04 08:48:36 +02:00
Jorge Penadés c64fe8c044 chore: refs #7207 refactor locale 2024-10-03 17:04:56 +02:00
Jorge Penadés b0ba6a5e0f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx 2024-10-03 15:40:05 +02:00
Pablo Natek c04dad38f1 feat: refs #7404 change travel name and remove buyer filter 2024-10-03 15:02:14 +02:00
Jorge Penadés e10088ed06 Merge branch 'dev' of https: refs #7702//gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword 2024-10-03 13:49:33 +02:00