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

6774 Commits

Author SHA1 Message Date
Alex Moreno 58a94599a9 Merge pull request '8062-testToMaster_2' (!792) from 8062-testToMaster_2 into master 
Reviewed-on: verdnatura/salix-front#792
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-10-03 05:48:02 +00:00
Javier Segarra fef875270e Merge branch 'dev' into 7679_improve_newPostcode_form 2024-10-02 22:08:13 +00:00
Pablo Natek 5e59ecdb43 fix: refs #7404 with on stockBought mobile version 2024-10-02 17:14:51 +02:00
Alex Moreno 8de5602564 chore: refs #8062 add changelog 2024-10-02 15:31:09 +02:00
Carlos Satorres 55ddc8644f refs #7283 fix itemMigration list filters 2024-10-02 12:51:33 +02:00
Jon Elias be53b466b9 Merge branch 'dev' into 7010-AddPackingField 2024-10-02 09:53:22 +00:00
Jon Elias 0b76d0d556 refactor: refs #7010 added function to get item packaging type 2024-10-02 11:52:16 +02:00
Carlos Satorres f9e3c92e68 Merge pull request 'warmFix-userListFixRole' (!788) from warmFix-userListFixRole into dev 
Reviewed-on: verdnatura/salix-front#788
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-02 09:41:57 +00:00
Carlos Satorres ba3b2198b8 Merge branch 'dev' into warmFix-userListFixRole 2024-10-02 09:31:54 +00:00
Jon Elias 0650380b7b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7010-AddPackingField 2024-10-02 11:29:54 +02:00
Jon Elias e6dc2f16b8 Merge pull request '#7884 added new filter field' (!720) from 7884-AddLabelerField into dev 
Reviewed-on: verdnatura/salix-front#720
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-02 08:46:55 +00:00
Jon Elias 375adfab76 Merge branch 'dev' into 7884-AddLabelerField 2024-10-02 08:46:08 +00:00
Carlos Satorres e374059f41 Merge pull request 'refs #6899 fix filters, date from to socialName' (!789) from 6899-fixInvoiceOutNegative into dev 
Reviewed-on: verdnatura/salix-front#789
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-02 08:45:54 +00:00
Jon Elias c54189e06a Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField 2024-10-02 10:43:55 +02:00
Jon Elias 98df741f1b fix: refs #7884 deleted useless translations 2024-10-02 10:43:54 +02:00
Carlos Satorres 49da7168ab Merge branch 'dev' into 6899-fixInvoiceOutNegative 2024-10-02 08:41:19 +00:00
Jon Elias 12727e93eb Merge branch 'dev' into 7884-AddLabelerField 2024-10-02 08:36:11 +00:00
Jon Elias 8fc3b2e86d Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField 2024-10-02 10:34:51 +02:00
Jon Elias 7db166974f feat: refs #7884 use VnTable prop for chip label filters and modified translations 2024-10-02 10:34:50 +02:00
Carlos Satorres c2c4acfc30 refs #6899 fix filters, date from to socialName 2024-10-02 09:42:38 +02:00
Javier Segarra c987a1151c Merge pull request 'Improve ZoneLocationTree height' (!786) from fix_height_zoneLocationTree into dev 
Reviewed-on: verdnatura/salix-front#786
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-02 07:36:09 +00:00
Javier Segarra 692c649b8c perf: refs #7679 #7679 improve watch 2024-10-02 09:29:05 +02:00
Jon Elias 03a3d6bd50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField 2024-10-02 08:47:21 +02:00
Javier Segarra 2bd004f52b perf: refs #7679 add sortBy & limit whe retrieve Autonomies 2024-10-01 21:56:12 +02:00
Javier Segarra 6b38bdf868 style: improve ZoneLocationTree height 2024-10-01 19:26:03 +00:00
Pablo Natek c0fd5a1c21 fix: refs #7404 fix style 2024-10-01 16:12:18 +02:00
Javi Gallego 38599be9bd Merge pull request '6722-showDegrees' (!782) from 6722-showDegrees into dev 
Reviewed-on: verdnatura/salix-front#782
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-01 14:05:36 +00:00
Javi Gallego 36457f704d Merge branch 'dev' into 6722-showDegrees 2024-10-01 14:04:18 +00:00
Javi Gallego 2f5358d439 Merge pull request '#7356 - transfer ticket method' (!784) from 7356_ticket_migration into dev 
Reviewed-on: verdnatura/salix-front#784
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-10-01 13:27:38 +00:00
Javier Segarra 2ca99a51ae fix: refs #7356 transfer ticket method 2024-10-01 15:12:22 +02:00
Jon Elias 209c88884f Merge branch 'dev' into 7884-AddLabelerField 2024-10-01 13:10:28 +00:00
Javier Segarra 1a697aa018 feat: refs #7679 #7679 add sortBy and limit 2024-10-01 15:02:42 +02:00
Carlos Satorres d69336c82a refs #7366 make travelFilter, travelList 2024-10-01 14:15:18 +02:00
Javi Gallego 4399a91e99 fix: misSpelling 2024-10-01 13:29:45 +02:00
Javi Gallego 589c672ab2 fix: show degrees 2024-10-01 13:28:49 +02:00
Javier Segarra ea7c799909 Merge pull request 'Fix: deleted code in sales' (!781) from FixSales into dev 
Reviewed-on: verdnatura/salix-front#781
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-01 10:36:30 +00:00
Jon Elias 7b63bb38f2 fix: deleted code 2024-10-01 12:34:39 +02:00
Jon Elias 21edf4b5d9 Merge pull request 'fix: duplicate call' (!775) from Fix-TicketSale into dev 
Reviewed-on: verdnatura/salix-front#775
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-01 09:54:30 +00:00
Javier Segarra 6e4677848f Merge branch 'dev' into Fix-TicketSale 2024-10-01 09:53:34 +00:00
Alex Moreno ddffd5b1c7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-01 11:47:55 +02:00
Alex Moreno 9b90487b6a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-01 11:47:43 +02:00
Alex Moreno 2e9a8d9205 fix(WorkerList): add type email 2024-10-01 11:47:31 +02:00
Alex Moreno 7ae90908c4 Merge pull request 'fix: solve conflicts from test to dev' (!780) from fixConflicts_testToDev into dev 
Reviewed-on: verdnatura/salix-front#780
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-01 09:47:05 +00:00
Javier Segarra 696c9ca9b3 fix: solve conflicts with stockBought 2024-10-01 11:40:29 +02:00
Javier Segarra 27b2d0232c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into fixConflicts_testToDev 2024-10-01 11:35:14 +02:00
Jon Elias 90ce9b2cd3 Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField 2024-10-01 11:32:17 +02:00
Jon Elias de01dda2ed refactor: refs #7884 modified icon color 2024-10-01 11:32:15 +02:00
Carlos Satorres e64e6eefe3 refs #7355 add role 2024-10-01 10:35:31 +02:00
Javier Segarra 8fa82c818d fix: remove limit 2024-10-01 10:04:56 +02:00
Javier Segarra 30767b110f Merge branch 'Fix-TicketSale' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketSale 2024-10-01 10:03:42 +02:00