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

6230 Commits

Author SHA1 Message Date
Javier Segarra d6efd21db6 style: remove space between value and label 2024-10-01 10:03:39 +02:00
Javier Segarra e9364f69d4 feat: #7679 show tooltips 2024-10-01 10:03:14 +02:00
Javier Segarra 41acf0e1e2 feat: #7679 show country provinces 2024-10-01 00:24:34 +02:00
Javier Segarra e7a2d3aa85 fix: refs #7354 ZonLocation filter 2024-09-30 20:20:51 +02:00
Jon Elias 3c5a5c3905 Merge branch 'dev' into Fix-TicketSale 2024-09-30 12:36:19 +00:00
Jon Elias 76a77dcee9 fix: duplicate call 2024-09-30 14:35:10 +02:00
Pablo Natek 6014ccebb4 Merge pull request '7404-fixSomeStyleIssues' (!774) from 7404-fixSomeStyleIssues into dev 
Reviewed-on: verdnatura/salix-front#774
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-30 12:27:42 +00:00
Pablo Natek deb608cc96 Merge branch 'dev' into 7404-fixSomeStyleIssues 2024-09-30 12:26:37 +00:00
Javier Segarra 2d9dbbd23d Merge pull request '#8031 - Enable notify positive when user update self data' (!750) from 8031_notify_dataSaved into dev 
Reviewed-on: verdnatura/salix-front#750
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-30 11:35:18 +00:00
Javier Segarra 7001a707b9 Merge branch 'dev' into 8031_notify_dataSaved 2024-09-30 11:34:38 +00:00
Javier Segarra da78edb6d2 Merge branch '7404-fixSomeStyleIssues' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-fixSomeStyleIssues 2024-09-30 13:34:21 +02:00
Javier Segarra d4dc12ebe3 Merge pull request '#8018 - Show fields instead null/undefined' (!737) from 8018_location_label into dev 
Reviewed-on: verdnatura/salix-front#737
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-30 10:55:04 +00:00
Javier Segarra cf509d608a Merge branch 'dev' into 8018_location_label 2024-09-30 10:53:33 +00:00
Javier Segarra b3c36e555f style: refs #7404 compress spaces 2024-09-30 12:50:23 +02:00
Javier Segarra b41026806f style: refs #7404 compress spaces 2024-09-30 12:48:05 +02:00
Javier Segarra cf67865b0b feat: refs #7404 updates 2024-09-30 11:53:54 +02:00
Pablo Natek 90762f1d1c Merge branch '7404-fixSomeStyleIssues' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-fixSomeStyleIssues 2024-09-30 10:47:03 +02:00
Pablo Natek 7fa0a5b28c fix: refs #7404 path name 2024-09-30 10:47:02 +02:00
Javier Segarra 63d2b06b70 Merge branch 'dev' into 8031_notify_dataSaved 2024-09-30 08:23:12 +00:00
Pablo Natek 37d32a7934 Merge branch 'dev' into 7404-fixSomeStyleIssues 2024-09-30 08:14:44 +00:00
Pablo Natek c815177be9 fix: refs #7404 translate and width problem 2024-09-30 10:13:39 +02:00
Pablo Natek 868e6a312f fix: refs #7404 class name 2024-09-30 10:04:00 +02:00
Pablo Natek cb0d3c5bca fix: refs #7404 sticky footer and transparent header for vnTable 2024-09-30 09:46:00 +02:00
Javier Segarra fd202f30d2 Merge branch '8018_location_label' of https://gitea.verdnatura.es/verdnatura/salix-front into 8018_location_label 2024-09-30 09:43:09 +02:00
Javier Segarra 9d7db2020b Merge pull request '#7679 Filter data from others filters' (!769) from 7679_improve_filters into dev 
Reviewed-on: verdnatura/salix-front#769
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-30 07:19:30 +00:00
Javier Segarra 12a452d774 Merge branch 'dev' into 8031_notify_dataSaved 2024-09-27 18:02:24 +00:00
Javier Segarra cffd97a521 Merge branch 'dev' into 8018_location_label 2024-09-27 18:01:17 +00:00
Javier Segarra bec50d6eed perf: refs #7679 #7679 comments 2024-09-27 19:54:01 +02:00
Javier Segarra 157370ec26 Merge branch 'dev' into 8018_location_label 2024-09-27 13:18:06 +02:00
Javier Segarra e06d567e3c test: refs #7679 #7679 remove comment 2024-09-27 10:35:39 +02:00
Javier Segarra 6b2e0df9c2 test: refs #7679 #7679 improve test 2024-09-26 23:39:14 +02:00
Javier Segarra d2067c633d feat: refs #7679 #7679 use country or province to retrieve cities 2024-09-26 23:38:22 +02:00
Javi Gallego a2b7e81982 feat: warehouse 2024-09-26 16:23:18 +02:00
Pablo Natek 6e6b88d340 Merge pull request '7129-fixMigrationIssues' (!754) from 7129-fixMigrationIssues into dev 
Reviewed-on: verdnatura/salix-front#754
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-26 12:53:44 +00:00
Javier Segarra 428c6966f2 Merge branch 'dev' into 8018_location_label 2024-09-26 14:48:47 +02:00
Javier Segarra a0b3e933a8 Merge branch 'dev' into 8031_notify_dataSaved 2024-09-26 12:17:40 +00:00
Pablo Natek 6e6b65771a Merge branch 'dev' into 7129-fixMigrationIssues 2024-09-26 06:09:21 +00:00
Javi Gallego 9095c579db Merge pull request '6722-thermograph' (!761) from 6722-thermograph into dev 
Reviewed-on: verdnatura/salix-front#761
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-26 06:07:26 +00:00
Pablo Natek c388d5ab2a Merge branch 'dev' of https: refs #7129//gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues 2024-09-26 07:57:59 +02:00
Javi Gallego dcfdabde32 feat: tabulation 2024-09-25 14:17:26 +02:00
Javier Segarra 73c45b8c4a Merge branch 'dev' into 8031_notify_dataSaved 2024-09-25 12:08:40 +00:00
Javi Gallego eb0e18bf58 Merge branch 'dev' into 6722-thermograph 2024-09-25 13:48:12 +02:00
Javi Gallego bd2fa37450 feat: maxTemperature and minTemperature 2024-09-25 13:34:43 +02:00
Alex Moreno 8c13ceb3fe Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-25 13:28:13 +02:00
Alex Moreno 5f4df6eb96 Merge pull request '7155-travel_daysOnward_2' (!759) from 7155-travel_daysOnward_2 into test 
Reviewed-on: verdnatura/salix-front#759
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-09-25 11:27:25 +00:00
Alex Moreno bcada72f04 fix: refs #7155 use chip-locale 2024-09-25 13:24:22 +02:00
Alex Moreno 6bd2835c59 chore: refs #7155 typo 2024-09-25 13:18:26 +02:00
Alex Moreno 9a11f94922 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7155-travel_daysOnward_2 2024-09-25 13:17:34 +02:00
Alex Moreno 8dd2c44832 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-25 12:53:12 +02:00
Alex Moreno f04beb8f90 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-09-25 12:52:58 +02:00