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

3874 Commits

Author SHA1 Message Date
William Buezas 946aa6b24d Small changes 2024-06-04 15:10:00 -03:00
Jorge Penadés 7e0ceca623 feat: refs #6273 freelance form & vnRadio 2024-06-04 17:38:04 +02:00
William Buezas c71877cdb1 Account connections 2024-06-04 12:23:28 -03:00
Carlos Satorres 06ddcc5030 refs #7366 fix travel 2024-06-04 15:55:30 +02:00
Jorge Penadés a1bfe4c7ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt 2024-06-04 15:19:10 +02:00
William Buezas 969186c872 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/MailAliases 2024-06-04 09:29:19 -03:00
William Buezas ddc149b6fc adapt account privileges to new formModel changes 2024-06-04 09:25:03 -03:00
William Buezas c574af9e9b resolve conflicts 2024-06-04 09:15:55 -03:00
William Buezas 253b54379c Add submodules routes again 2024-06-04 09:14:48 -03:00
William Buezas 37a8956f86 Merge branch 'feature/AccountList' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/AccountList 2024-06-04 09:11:37 -03:00
William Buezas 84ad1745e2 several changes 2024-06-04 09:10:40 -03:00
Javi Gallego 857aca49dd feat: refs #4560 sin DeliveryMan 2024-06-04 14:06:04 +02:00
William Buezas c96e6482f9 remove mail alias content 2024-06-04 08:42:32 -03:00
William Buezas 3efca6242d Account ACLs 2024-06-04 08:41:41 -03: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
Javi Gallego f1df969fa6 feat: refs #560 refactor descriptor 2024-06-04 10:52:00 +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
Javi Gallego 5f00f3bad4 Merge branch 'dev' into 4560-gastos-reparto 2024-06-04 09:42:44 +02:00
Jorge Penadés 0b0754f76e refactor: refs #6273 replace QBtnGroup with QRadio for worker type selection 2024-06-04 09:33:51 +02:00
Jorge Penadés de4ea6271b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt 2024-06-04 09:00:57 +02:00
Jorge Penadés 1bc99cbd22 feat: refs #6243 show all cmrs & filter by warehouse 2024-06-03 16:30:59 +02:00
Jorge Penadés b93b630c6a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection 2024-06-03 15:21:44 +02:00
Jorge Penadés 0b92e98511 fix: refs #6891 show cross 2024-06-03 15:19:33 +02:00
Javier Segarra ef47b34569 Merge branch 'dev' into feature/MailAliases 2024-06-03 13:09:54 +00:00
Javier Segarra 0d1453ddeb feat: isPublic checkbox 2024-06-03 15:09:34 +02:00
Javier Segarra 668dc5fd53 fix: List without limit 2024-06-03 15:09:21 +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
William Buezas 8320a75e61 make searchbar work 2024-06-03 09:03:37 -03:00
William Buezas 02d8254df9 rest of submodules 2024-06-03 08:47:32 -03: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
Javi Gallego 56a46cd130 4560 2024-06-03 11:52:19 +02:00
Javi Gallego ca4193e11a Merge branch 'dev' into 4560-gastos-reparto 2024-06-03 11:31:33 +02:00
Carlos Satorres 0d25c1b66b refs #7366 fix travel 2024-06-03 11:27: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
Jon Elias aabf5420b9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7003-fixedPriceOrder 2024-06-03 08:47:34 +02:00
William Buezas 8e1f7c24a4 submodules WIP 2024-06-02 13:26:46 -03:00
William Buezas 1c14841233 Several changes 2024-05-31 14:02:50 -03: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
Alex Moreno 221ed7c534 feat(TravelSummary): isConfirmed checkbox 2024-05-31 14:02:32 +02:00
Javier Segarra 59f9cf4111 fix: src/pages/InvoiceIn/Card/InvoiceInBasicData.vue 2024-05-31 13:56:46 +02:00