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

3905 Commits

Author SHA1 Message Date
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
Javier Segarra fe9adb7a3c perf: minor changes 2024-06-06 08:09:05 +02:00
Javier Segarra f3ec9ea58d fix: VnPaginate order 2024-06-06 08:03:57 +02:00
William Buezas 9ed297207b Make create form work 2024-06-05 14:52:45 -03:00
Javier Segarra f453f42b06 feat: New and edit ACL from Popup 2024-06-05 19:37:53 +02:00
Javier Segarra 807460dfad fix: info icon 2024-06-05 18:14:41 +02:00
Jorge Penadés 56af348fdd feat: refs #6273 update changelog 2024-06-05 17:29:40 +02:00
Jorge Penadés 382591fb11 fix: refs #6273 set paymethodFk to 0 if it is external 2024-06-05 17:13:52 +02:00
Javier Segarra de488169b7 feat: AccountDescriptor 2024-06-05 15:09:43 +02:00
Javier Segarra 30c912fa62 reset changes 2024-06-05 11:38:10 +02:00
Javier Segarra c87629f2ec fix: accountBasicData after update 2024-06-05 11:35:48 +02:00
Javier Segarra 3227d299e9 updates 2024-06-05 10:57:12 +02:00
Carlos Satorres b852faf91f refs #6905 fix userPanel 2024-06-05 08:58:12 +02:00
Javier Segarra 0bb6498061 fix: minor i18n 2024-06-04 20:33:24 +02:00
William Buezas 9f6d0b4dc9 Remove roles 2024-06-04 15:15:12 -03:00
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
Jon Elias 93744fce65 Merge branch '6896-EndOrderMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6896-EndOrderMigration 2024-06-04 09:54:47 +02:00
Jon Elias adf7c3a139 feat: refs #6896 new filters 2024-06-04 09:54:45 +02: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