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

3048 Commits

Author SHA1 Message Date
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
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 64f41cf8dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel 2024-05-07 13:47:39 +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
Jorge Penadés 097e25a0b8 feat: refs #6891 shelving 2024-05-07 11:22:35 +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 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
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 605a24156b Merge branch 'dev' into feature/ItemShelving 2024-05-06 07:54:28 +00:00
Javier Segarra 49b6c57ad4 fix: show Color 2024-05-06 08:53:12 +02:00
Javier Segarra 6a81076874 fix: replace inputMin rule 2024-05-06 08:45:29 +02:00
Javier Segarra 62bf968b0b change action to st-actions 2024-05-06 08:41:12 +02:00
Javier Casado f6abcc6693 Merge pull request 'refs #7113 fix test' (!318) from 7113-fixClaimPhoto into dev 
Reviewed-on: verdnatura/salix-front#318
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-06 06:38:47 +00:00
Javier Segarra f85665b271 fix: replace QToolbar by Teleport 2024-05-06 08:37:41 +02:00
Javier Segarra 0f5d06614d feat: VnInput numberValidation 2024-05-06 07:24:52 +02:00
William Buezas d15a92ce7d Resolve conflicts 2024-05-03 08:57:39 -03:00
jcasado e744077d65 Merge branch '7113-fixClaimPhoto' of https://gitea.verdnatura.es/verdnatura/salix-front into 7113-fixClaimPhoto 2024-05-03 10:21:49 +02:00
jcasado f7e91424b9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7113-fixClaimPhoto 2024-05-03 10:21:41 +02:00
Javier Casado 534f71c9e3 Merge branch 'dev' into 7113-fixClaimPhoto 2024-05-03 07:26:10 +00:00
William Buezas d2e178a41b resolve conflicts 2024-05-02 12:02:44 -03:00
William Buezas d68934a526 Item basic data 2024-05-02 11:51:04 -03:00
Javier Segarra e3a36c0ab1 Merge pull request 'refactor: refs #6887 pending claim changes' (!335) from 6887-endClaimMigration into dev 
Reviewed-on: verdnatura/salix-front#335
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-05-02 12:45:12 +00:00
Javier Segarra 9fa03beda1 Merge branch 'dev' into 6887-endClaimMigration 2024-05-02 12:44:02 +00:00
Javier Segarra 9dcce336a8 Merge pull request 'Item last entries' (!342) from hyervoni/salix-front-mindshore:feature/ItemLastEntries into dev 
Reviewed-on: verdnatura/salix-front#342
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-02 12:43:04 +00:00
Javier Segarra 988be19b96 Merge branch 'dev' into 6887-endClaimMigration 2024-05-02 12:42:46 +00:00
Javier Segarra d069ca5095 Merge branch '6887-endClaimMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6887-endClaimMigration 2024-05-02 14:40:59 +02:00
Javier Segarra 1a79bd6fb8 feat: zoneSummary 2024-05-02 14:40:56 +02:00
Javier Segarra 03759d2746 Merge branch 'dev' into feature/ItemLastEntries 2024-05-02 14:34:54 +02:00
Javier Segarra 1675919801 fix: minor build bugs 2024-05-02 14:33:24 +02:00
Javier Segarra 7e842f2ce1 Merge pull request 'Item tax' (!337) from hyervoni/salix-front-mindshore:feature/ItemTax into dev 
Reviewed-on: verdnatura/salix-front#337
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-02 12:23:53 +00:00