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

3634 Commits

Author SHA1 Message Date
Javier Segarra ec5d5e52f4 Merge branch 'dev' into feature/ZoneCalendar 2024-06-07 09:32:51 +02:00
Javier Segarra 53c47301c7 Merge pull request '#6911 save on enter' (!207) from 6911-saveOnEnter into dev 
Reviewed-on: verdnatura/salix-front#207
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-07 07:20:46 +00:00
Javier Segarra 7880f66c6e Merge branch '6911-saveOnEnter' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter 2024-06-07 00:59:20 +02:00
Javier Segarra 28836fc514 test: fix test beacuse use {enter} 2024-06-07 00:59:17 +02:00
Javier Segarra 2a85fe21b0 Merge branch 'dev' into 6911-saveOnEnter 2024-06-07 00:46:42 +02:00
Javier Segarra 1237dd5c10 fix: style workweek 2024-06-07 00:13:49 +02:00
Javier Segarra 17c3a89264 fix: show exclusionEvent in Calendar 2024-06-07 00:01:35 +02: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
Javier Segarra 26c7b09b8a perf: improve handleKeyUp method 2024-06-06 07:50:24 +00: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 0ad839dfc6 src/pages/Order/Card/OrderCatalogItemDialog.vue 2024-05-31 14:40:16 +02:00
Javier Segarra e6a1c31119 fix: src/pages/InvoiceOut/InvoiceOutGlobalForm.vue 2024-05-31 14:31:41 +02:00
Javier Segarra 59f9cf4111 fix: src/pages/InvoiceIn/Card/InvoiceInBasicData.vue 2024-05-31 13:56:46 +02:00
Javier Segarra 25d5887a57 fix: src/pages/Entry/Card/EntryBuysImport.vue 2024-05-31 13:42:49 +02:00
Javier Segarra 492e333d2f fix: i18n VnNotes 2024-05-31 13:40:19 +02:00
Javier Segarra d8bf95008a fix: src/components/EditPictureForm.vue 2024-05-31 13:33:03 +02:00
Javier Segarra d5dc9d974c fix: ClaimBasicData form 2024-05-31 13:20:55 +02:00
Javier Segarra 5139bba5a0 fix: handle VnNotes keyup 2024-05-31 12:37:30 +02:00
Javier Segarra 0450986025 fix InvoiceInBasicdata 2024-05-31 12:01:18 +02:00
Javier Segarra d072fc858d Merge branch 'dev' into 6911-saveOnEnter 2024-05-31 11:59:29 +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