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

6403 Commits

Author SHA1 Message Date
Jon Elias fa0625aa86 Merge branch 'Fix_OrderModuleProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems 2024-10-18 14:12:25 +02:00
Jon Elias 11bf70d76c fix: category and tags filters 2024-10-18 14:12:23 +02:00
Javier Segarra 3d5d267345 revert: commit 2024-10-10 09:29:12 +02:00
Javier Segarra f16707756e fix: change type vnput 2024-10-10 09:29:04 +02:00
Jon Elias d721083795 fix: filter panel 2024-10-10 08:43:33 +02:00
Jon Elias 419d3d2d45 fix: refs #6896 fixed module problems 2024-10-10 07:20:33 +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
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
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
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 9fe3de22ac Merge branch '7323-fineTunningWorker' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-10-04 13:37:57 +02: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
Jorge Penadés 9f433afb51 Merge pull request '#7702 - FIX Change password error' (!542) from 7702_fix_setPassword into dev 
Reviewed-on: verdnatura/salix-front#542
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-04 11:15:42 +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
Carlos Satorres 45c8f6f4c5 Merge pull request 'refs #7355 fix searchbar' (!797) from hotfix-AccountSearchbar into master 
Reviewed-on: verdnatura/salix-front#797
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-04 10:09:53 +00:00
Jorge Penadés ae8e4ba4b9 chore: refs #7702 fix tests 2024-10-04 11:54:40 +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
Jorge Penadés cebb3b2b16 Merge branch 'dev' into 7323-fineTunningWorker 2024-10-04 07:47:46 +00:00
Pablo Natek 222e83cad8 Merge pull request 'feat: refs #7404 change travel name and remove buyer filter' (!796) from 7404-addSomeLogisticPreferences into dev 
Reviewed-on: verdnatura/salix-front#796
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-04 06:59:12 +00:00
Pablo Natek 4ba52f1a56 Merge branch 'dev' into 7404-addSomeLogisticPreferences 2024-10-04 06:55:41 +00:00
Pablo Natek 7d0e3e6fd4 Merge pull request 'fix: refs #7129 translates from globals to module locals' (!794) from 7129--fixTranslates into dev 
Reviewed-on: verdnatura/salix-front#794
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-04 06:54:11 +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
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
Jorge Penadés c78e816f0c Merge pull request 'fix: refs #7524 dynamic fetch' (!767) from 7524-dynamicFetch into dev 
Reviewed-on: verdnatura/salix-front#767
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-10-03 10:06:57 +00:00
Jorge Penadés fadfafbb1d Merge branch 'dev' into 7524-dynamicFetch 2024-10-03 10:05:22 +00:00
Pablo Natek 05a1d0e8fb fix: refs #7129 translates from globals to module locals 2024-10-03 10:52:16 +02:00
Jorge Penadés 30e34ea299 Merge branch 'dev' into 7323-fineTunningWorker 2024-10-03 07:59:46 +00:00
Pablo Natek 629524d63f Merge pull request 'fix: refs #7404 fix style' (!785) from 7404-fixStyle into dev 
Reviewed-on: verdnatura/salix-front#785
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-03 07:54:18 +00:00
Pablo Natek 06fa5b13a4 Merge branch 'dev' into 7404-fixStyle 2024-10-03 07:47:52 +00:00
Jorge Penadés 739671a6da Merge branch 'dev' into 7524-dynamicFetch 2024-10-03 07:25:40 +00:00