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

6280 Commits

Author SHA1 Message Date
Pablo Natek e5eb1d7663 Merge pull request 'fix: refs #7404 revert commit prevent production access' (!771) from 7404-remove-from-test into test 
Reviewed-on: verdnatura/salix-front#771
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-30 05:18:36 +00:00
Pablo Natek f005674db6 Merge branch 'test' into 7404-remove-from-test 2024-09-30 05:17:08 +00:00
Javier Segarra 8356be1ec0 fix: onDataSaved VnTable 
Habia un problema al usar this en entorno no local
 2024-09-27 18:10:43 +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 5097cc8b81 Merge pull request 'fix: #6943 show nickname salesPerson' (!766) from warmfix_customerModule into test 
Reviewed-on: verdnatura/salix-front#766
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-27 11:37:03 +00:00
Javier Segarra 157370ec26 Merge branch 'dev' into 8018_location_label 2024-09-27 13:18:06 +02:00
Pablo Natek 336f2ba89e fix: refs #7404 remove from test 2024-09-27 12:41:00 +02:00
Pablo Natek 193670fdcf fix: refs #7404 revert commit prevent production access 2024-09-27 12:39:30 +02:00
Javier Segarra e06d567e3c test: refs #7679 #7679 remove comment 2024-09-27 10:35:39 +02:00
Jon Elias 45c0d0ae3f Merge pull request 'Hotfix: fixed ticket state function' (!770) from Hotfix-ChangeTicketState into master 
Reviewed-on: verdnatura/salix-front#770
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-27 08:08:45 +00:00
Jorge Penadés b541ce4e56 fix: split params 2024-09-27 09:59:18 +02:00
Javier Segarra 2990d32705 fix: grafana url 2024-09-27 07:56:50 +00:00
Jon Elias 2be969339e Merge branch 'master' into Hotfix-ChangeTicketState 2024-09-27 07:26:16 +00:00
Jon Elias 6b0a0f71ce fix: fixed change state function 2024-09-27 08:24:58 +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
Javier Segarra 807827c97c Merge branch 'test' into warmfix_customerModule 2024-09-26 16:25:27 +00:00
Javier Segarra d5253149ed Merge pull request 'fix: split params' (!768) from warmfix-addSearchUrl into test 
Reviewed-on: verdnatura/salix-front#768
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-26 16:21:48 +00:00
Javi Gallego a2b7e81982 feat: warehouse 2024-09-26 16:23:18 +02:00
Jorge Penadés 353116a7a0 fix: split params 2024-09-26 15:49:12 +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 bbf3b6d4b7 fix: #6943 show nickname salesPerson 2024-09-26 12:29:03 +00:00
Javier Segarra a0b3e933a8 Merge branch 'dev' into 8031_notify_dataSaved 2024-09-26 12:17:40 +00:00
Alex Moreno f00db79d47 fix(VnTable): header background-color 2024-09-26 14:14:27 +02:00
Jorge Penadés 2057189b8e Merge pull request '#7524 remove old filter' (!764) from 7524-hotfix-removeOldFilter into master 
Reviewed-on: verdnatura/salix-front#764
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-09-26 11:03:36 +00:00
Jorge Penadés c5766aa1b3 chore: refs #7524 remove old filter 2024-09-26 12:38:03 +02: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
Javier Segarra 0b47623011 Merge pull request 'HOTFIX: itemFixedPrice' (!755) from hotfix_itemFixedPrice into master 
Reviewed-on: verdnatura/salix-front#755
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-25 21:15:35 +00:00
Javier Segarra a8c96278de Merge branch 'master' into hotfix_itemFixedPrice 2024-09-25 21:04:13 +00: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
Jorge Penadés 0dec6edc68 Merge pull request 'fix: refs #6898 add role' (!757) from 6898-hotfix-addRole into master 
Reviewed-on: verdnatura/salix-front#757
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-25 10:48:16 +00:00
Jorge Penadés aab428494e fix: refs #6898 add role 2024-09-25 12:40:22 +02:00
Pablo Natek cea5edd506 fix: refs #7129 translate 2024-09-25 12:33:19 +02:00
Javier Segarra 357f3ba308 Merge pull request 'fix: refs #6943 prevent null' (!756) from 6943-warmfix-preventNull into test 
Reviewed-on: verdnatura/salix-front#756
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-25 10:26:14 +00:00
Jorge Penadés d2996f0838 fix: refs #6943 prevent null 2024-09-25 12:23:41 +02:00