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

3307 Commits

Author SHA1 Message Date
Jorge Penadés 613492d04a Merge pull request 'fix conflicts' (!361) from testToDev into dev 
Reviewed-on: verdnatura/salix-front#361
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
 2024-05-07 14:37:08 +00:00
Jorge Penadés 7504e5d12c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel 2024-05-07 16:36:34 +02:00
Jorge Penadés 0e7c2c7118 Merge pull request '#6938-warmfix' (!359) from 6938-warmfix into test 
Reviewed-on: verdnatura/salix-front#359
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-05-07 14:21:13 +00:00
Jorge Penadés 392d1892ba Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into testToDev 2024-05-07 16:19:13 +02:00
Jorge Penadés 5e0db81a21 fix: refs #6938 conflicts 2024-05-07 15:51:55 +02:00
Jorge Penadés ac0ebf431f Merge pull request '#6938 wamfix workerCard' (!357) from 6938-warmfix-masterToTest into test 
Reviewed-on: verdnatura/salix-front#357
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-05-07 13:37:05 +00:00
Jorge Penadés 0a71060f60 fix: refs #6938 workerCard 2024-05-07 15:28:00 +02:00
Jorge Penadés 014ec60e47 feat: refs #6891 worker & supplier 2024-05-07 15:10:36 +02:00
Alex Moreno 1d9616c25e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-05-07 14:18:56 +02:00
Alex Moreno 13f8937f12 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-05-07 14:18:36 +02:00
Jorge Penadés 6b1befa037 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel 2024-05-07 14:15:03 +02:00
Jorge Penadés 64f41cf8dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel 2024-05-07 13:47:39 +02:00
Carlos Satorres a691644b9a refs #6877 changes filter date 2024-05-07 13:38:25 +02:00
Jorge Penadés 0703de350c fix: refs #6891 rollback order & route searchbar 2024-05-07 13:04:27 +02:00
Javier Segarra 0843d70951 Merge pull request 'Item Shelving' (!343) from hyervoni/salix-front-mindshore:feature/ItemShelving into dev 
Reviewed-on: verdnatura/salix-front#343
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-07 10:57:43 +00:00
Alex Moreno 9b31fa5042 Merge branch 'dev' into feature/ItemShelving 2024-05-07 10:54:12 +00:00
Javier Segarra 175746a4a4 Merge pull request 'Item Basic data' (!346) from hyervoni/salix-front-mindshore:feature/ItemBasicData into dev 
Reviewed-on: verdnatura/salix-front#346
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-07 10:47:01 +00:00
Javier Segarra 753b5bf939 Merge branch 'dev' into feature/ItemBasicData 2024-05-07 10:44:48 +00:00
Jorge Penadés 095e62ebac Merge pull request '#6938 rollback phone' (!355) from 6938-hotfix-rollbackHidePhone into master 
Reviewed-on: verdnatura/salix-front#355
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-07 10:44:05 +00:00
Jorge Penadés 5712810ae2 fix: refs #6938 rollback phone 2024-05-07 12:00:20 +02:00
Javier Segarra 33dac72f1c Merge branch 'dev' into feature/ItemTags 2024-05-07 09:39:35 +00:00
Javier Segarra c0dd140a3a fix: validTag 2024-05-07 11:38:12 +02:00
Javier Segarra 0dc95ca3a0 fix: VnSelectFilter 2024-05-07 11:35:41 +02:00
Jorge Penadés 097e25a0b8 feat: refs #6891 shelving 2024-05-07 11:22:35 +02:00
Carlos Satorres ac0993aa11 refs #6842 pr changes 2024-05-07 10:20:26 +02:00
Jorge Penadés 777ee0895e feat: refs #6891 route & drop searchbar 2024-05-07 10:15:47 +02:00
Jorge Penadés e9f5c0cc8d feat: refs #6891 add custom url 2024-05-07 10:12:35 +02:00
Jorge Penadés 111333a6cf fix: refs #6891 reactivity & show filter panel 2024-05-07 09:46:52 +02:00
Jorge Penadés 48bba65baf fix: refs #6891 use vnCard searchbar 2024-05-07 09:30:59 +02:00
Jorge Penadés c894945363 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel 2024-05-07 09:10:51 +02:00
Alex Moreno a139c11a22 Merge branch 'test' into fix_Customer_1 2024-05-07 07:05:25 +00:00
Carlos Satorres b9c6b01437 refs #6877 update model 2024-05-07 08:59:55 +02:00
Alex Moreno 4caf27b4f8 deploy: init version 2422 2024-05-07 08:37:52 +02:00
Alex Moreno 82db1fac11 Merge pull request '7336_devToTest' (!354) from 7336_devToTest into test 
Reviewed-on: verdnatura/salix-front#354
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-05-07 06:33:59 +00:00
Alex Moreno e4ffd4fcdd Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-05-07 08:04:46 +02:00
Alex Moreno 5341f555ef Merge pull request '7299_testToMaster' (!351) from 7299_testToMaster into master 
Reviewed-on: verdnatura/salix-front#351
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-05-07 05:36:02 +00:00
Jorge Penadés 036ef72593 fix: refs #6891 showFilterPanel 2024-05-06 17:27:30 +02:00
Jorge Penadés fe11164ae9 fix: refs #6891reactivity on agency module 2024-05-06 16:45:10 +02:00
Jorge Penadés 7b6841afc6 feat: refs #6891 hide if no content 2024-05-06 16:44:48 +02:00
Jorge Penadés b1147f00d3 refactor: refs #6891 use Teleport | slot 2024-05-06 16:16:00 +02:00
Javier Segarra b21abf40d2 fix: Update from-to when cmpaign changes 2024-05-06 15:15:35 +02:00
Carlos Satorres 1a68cc0ced refs #6877 change attender 2024-05-06 15:00:18 +02:00
Jon Elias 6ce57d3c40 fix: #7274 2024-05-06 14:59:23 +02:00
Jorge Penadés 15b080f7bd feat: refs #6891 add redirection on VnfilterPanel 2024-05-06 14:27:04 +02:00
Jorge Penadés b487ff4adc feat: refs #6891 create rightMenu 2024-05-06 14:25:39 +02:00
Jorge Penadés d444a8721d feat: refs #6891 create composable & update searchbar 2024-05-06 14:05:58 +02:00
Javier Segarra 4d490652ea feat #7271: add template 2024-05-06 10:11:07 +02:00
Javier Segarra 211da4a995 Merge remote-tracking branch 'origin/dev' into 7271_boilerplate_zones 2024-05-06 10:03:29 +02:00
Javier Segarra 605a24156b Merge branch 'dev' into feature/ItemShelving 2024-05-06 07:54:28 +00:00
Robert Ferrús 755730a030 Merge branch 'dev' into 7039-country-country 2024-05-06 07:23:42 +00:00