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

3281 Commits

Author SHA1 Message Date
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
Jon Elias 5ed2a82194 feat: refs #6739 transferInvoice new checkbox and functionality 2024-05-06 14:50:15 +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
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
Robert Ferrús 24edecf51a Merge branch 'dev' into 7039-country-country 2024-05-06 05:08:39 +00:00
William Buezas dbc9e9dd71 Sales monitor base 2024-05-05 19:13:36 -03:00
William Buezas f3b1de1ee4 Item tags 2024-05-03 17:19:13 -03:00
Javier Segarra 743faef956 fix: #6842 Not update calendar correctly 2024-05-03 15:05:37 +02:00
Carlos Satorres 710b45f43a refs #6842 isFreelance 2024-05-03 14:49:50 +02:00
William Buezas d15a92ce7d Resolve conflicts 2024-05-03 08:57:39 -03:00
William Buezas 99adc9aa05 WIP 2024-05-03 08:53:50 -03:00
Jon Elias 312985b427 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7271_boilerplate_zones 2024-05-03 12:37:30 +02:00
Jon Elias f03ad52387 Merge branch '7271_boilerplate_zones' of https://gitea.verdnatura.es/verdnatura/salix-front into 7271_boilerplate_zones 2024-05-03 12:31:22 +02:00
Jon Elias 1a5f2fbea2 feat: refs #7271 advanced structure 2024-05-03 12:30:53 +02: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
Jon Elias f3026dfe00 Merge branch '6767-deleteDivCol' of https://gitea.verdnatura.es/verdnatura/salix-front into 6767-deleteDivCol 2024-05-03 08:56:40 +02:00
Jon Elias 8f0af24f50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6767-deleteDivCol 2024-05-03 08:56:38 +02:00
Jon Elias 179ab30805 Merge branch 'fix_Customer_1' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_Customer_1 2024-05-03 08:40:55 +02:00
Jon Elias 3467f30b12 refactor: refs #7274 changed CustomerNotificationsCampaignConsumption template and logic 2024-05-03 08:40:53 +02: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