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

3556 Commits

Author SHA1 Message Date
William Buezas f305cee3ce Account view forms 2024-06-06 14:07:40 -03:00
Alex Moreno 985ce9a643 deploy: test to dev 2024-06-06 12:24:08 +02:00
Alex Moreno 0f83580766 Merge pull request '#6942 warmfix fix formModel' (!425) from 6942-warmfix-fixFormModel into test 
Reviewed-on: verdnatura/salix-front#425
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-06 10:22:27 +00:00
Jorge Penadés 5d041e2d03 fix: refs #6942 fix emit on reset 2024-06-06 12:14:00 +02:00
Jorge Penadés 209d5bd13e fix: refs #6942 rollback 2024-06-06 12:09:56 +02:00
Jorge Penadés aba27c204a Merge pull request '#6891 add toggle' (!417) from 6891-addToggleFilterPanel into dev 
Reviewed-on: verdnatura/salix-front#417
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-06 08:48:27 +00:00
Jorge Penadés b27ae621f3 Merge branch 'dev' into 6891-addToggleFilterPanel 2024-06-06 08:45:12 +00:00
Jorge Penadés ebbeea0eff fix: refs #6942 e2e test 2024-06-06 10:28:41 +02:00
Jorge Penadés 97dc299cfe fix: refs #6942 fix emit on data saved 2024-06-06 09:53:48 +02:00
Alex Moreno f66d7b91f7 Merge pull request 'Account Roles' (!413) from hyervoni/salix-front-mindshore:feature/AccountRoles into dev 
Reviewed-on: verdnatura/salix-front#413
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-06 07:35:46 +00:00
Alex Moreno 454527b0a7 remove console.log 2024-06-06 09:34:42 +02:00
Alex Moreno aee3c67ee0 clean code 2024-06-06 09:33:01 +02:00
Alex Moreno 395eb6bed7 Merge branch 'dev' into feature/AccountRoles 2024-06-06 07:32:15 +00:00
Jon Elias a3d3d7d1e6 Merge pull request '#7502 new Lilium icons' (!420) from 7502-liliumIcons into dev 
Reviewed-on: verdnatura/salix-front#420
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-06 06:41:24 +00:00
Jon Elias 057e4780ae Merge branch '7502-liliumIcons' of https://gitea.verdnatura.es/verdnatura/salix-front into 7502-liliumIcons 2024-06-06 08:38:21 +02:00
Jon Elias 516b905305 feat: refs #7502 new icons v1.73 2024-06-06 08:38:19 +02:00
Jon Elias 4c50cb816d Merge branch 'dev' into 7502-liliumIcons 2024-06-04 09:55:04 +00:00
Jon Elias 535798af25 feat: refs #7502 new Lilium icons 2024-06-04 11:53:24 +02:00
Alex Moreno 26ddb483f6 build: add new version 2024-06-04 10:08:49 +02:00
Alex Moreno e532f0d167 Merge pull request '7525-devToTest' (!419) from 7525-devToTest into test 
Reviewed-on: verdnatura/salix-front#419
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-06-04 08:06:27 +00:00
Jorge Penadés 0b92e98511 fix: refs #6891 show cross 2024-06-03 15:19:33 +02:00
Jorge Penadés f55e9d7c32 fix: refs #6891 Optimize RightMenu component rendering 2024-06-03 14:20:46 +02:00
Jorge Penadés e6f0e6b089 refactor: refs #6891 Remove unused i18n 2024-06-03 14:12:49 +02:00
Jorge Penadés 2a61ca4dbb refactor: refs #6891 drop isHeaderMounted condition 2024-06-03 14:11:40 +02:00
Jorge Penadés 36ff4e9312 refactor: refs #6891 searchbar teleport 2024-06-03 12:58:26 +02:00
Jorge Penadés c78828d6a6 refactor: refs #6891 Move filter panel rendering to RightMenu component 2024-06-03 12:29:44 +02:00
Jorge Penadés 217f9bd86c fix: refs #6891 rollback 2024-06-03 11:25:21 +02:00
Jorge Penadés 3a0f99ac22 feat: refs #6891 Add collapse menu button to filter panel 2024-06-03 11:10:46 +02:00
Jorge Penadés 76f858ba7e Merge pull request '#6600 create photo comment' (!416) from 6600-itemPhotoComment into dev 
Reviewed-on: verdnatura/salix-front#416
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-06-03 08:07:44 +00:00
Jorge Penadés d2180c67f7 refactor: refs #6600 replace QInput to VnInput 2024-06-03 09:35:59 +02:00
Jorge Penadés f58b072964 feat: refs #6600 Add option to add comment for photo motivation 2024-06-03 09:30:37 +02:00
Javier Segarra 28173ddee2 Merge branch 'dev' into feature/AccountRoles 2024-05-31 10:24:37 +02:00
Javier Segarra 4268f15d30 perf: remove unnecessary submodules 2024-05-31 10:23:03 +02:00
William Buezas 4bd78922af remove unnecesary files 2024-05-30 15:43:26 -03:00
William Buezas 05b7df9168 Role submodules 2024-05-30 15:34:37 -03:00
William Buezas ed2ba5458d Avoif filter panel from redirecting 2024-05-30 08:34:53 -03:00
Alex Moreno 5799a1121b fix: searchbar redirect 2024-05-30 10:22:13 +02:00
Alex Moreno 2cf0a717ac deploy: increase version 2024-05-30 09:23:17 +02:00
William Buezas d82de6da58 Account roles 2024-05-29 16:14:29 -03:00
William Buezas b5e72aec7c Wip 2024-05-29 08:01:37 -03:00
Alex Moreno 15223971f1 fix: defaulter icon 2024-05-29 12:53:12 +02:00
Jorge Penadés f15e8e42b3 Merge pull request '#6942 improve invoiceIn' (!220) from 6942-improveInvoceIn into dev 
Reviewed-on: verdnatura/salix-front#220
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-05-29 07:03:45 +00:00
William Buezas 0659eac652 Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountRoles 2024-05-28 18:38:13 -03:00
Jorge Penadés 0de575bb6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-28 13:14:11 +02:00
Jorge Penadés 3b3e7e7e03 fix: refs #6942 tests & summary table spacing 2024-05-28 13:11:38 +02:00
Javier Segarra d98717f253 Merge pull request 'Zone Locations' (!390) from hyervoni/salix-front-mindshore:feature/ZoneLocations into dev 
Reviewed-on: verdnatura/salix-front#390
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-28 10:53:26 +00:00
Javier Segarra 909c545106 Merge branch 'dev' into feature/ZoneLocations 2024-05-28 10:46:53 +00:00
Alex Moreno c88934218a Merge pull request 'feat: refs #7494 new icons' (!409) from 7494-icons into dev 
Reviewed-on: verdnatura/salix-front#409
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-05-28 10:20:52 +00:00
Alex Moreno d15f31de03 Merge branch 'dev' into 7494-icons 2024-05-28 10:19:49 +00:00
Alex Moreno 93fb3096e0 feat: refs #7494 new icons 2024-05-28 12:17:51 +02:00