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

2930 Commits

Author SHA1 Message Date
Jon Elias 15bb9f596c Merge branch 'dev' into 6464-fixNegativeBases 2024-06-10 10:00:42 +00:00
Jon Elias 4b2d977542 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases 2024-06-10 11:59:34 +02:00
Javi Gallego 911ff376fd Merge pull request '#4560 - gastos-reparto' (!421) from 4560-gastos-reparto into dev 
Reviewed-on: verdnatura/salix-front#421
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-10 08:16:57 +00:00
Jon Elias f3a28edb5e Merge branch 'dev' into 7003-fixedPriceOrder 2024-06-10 05:12:28 +00:00
Javier Segarra 21a412f688 Merge branch 'dev' into feature/MailAliases 2024-06-07 10:53:17 +00:00
Alex Moreno dce95824be fix(AccountAlias): fix and optimization 2024-06-07 12:51:38 +02:00
Jon Elias deb6b448fb Merge branch 'dev' into 7003-fixedPriceOrder 2024-06-07 10:48:09 +00:00
Jon Elias d6bd3de971 refactor: refs #7003 fixed order param 2024-06-07 12:47:18 +02:00
Jon Elias 290325b677 refactor: refs #7003 changed order filter 2024-06-07 12:45:22 +02:00
Alex Moreno c392b44195 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-06-07 12:03:41 +02:00
Jorge Penadés bd7b3c2d06 feat: refs #7542 drop space 2024-06-07 11:54:26 +02:00
Jorge Penadés 5922838fcd feat: refs #7542 empty 2024-06-07 11:54:06 +02:00
Carlos Satorres 3729817c2b Merge branch 'dev' into 6905-fixUserPanelLocal 2024-06-07 09:47:48 +00:00
Javier Segarra 5551077c92 fix: roles 2024-06-07 11:16:15 +02:00
Javier Segarra 6053d42442 fix: descriptor and i18n 2024-06-07 11:09:46 +02:00
Javier Segarra 567c9ad307 Merge branch 'dev' into feature/MailAliases 2024-06-07 10:46:24 +02:00
Javier Segarra edad698f72 fix: update list when update record 2024-06-07 10:21:41 +02:00
Javier Segarra 6c608e86e6 Merge branch 'feature/AccountAcls' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/AccountAcls 2024-06-07 10:19:55 +02:00
Javier Segarra 0ea44eb8db Merge branch 'dev' into feature/AccountAcls 2024-06-07 10:07:15 +02:00
Jorge Penadés c0c066fd98 fix: refs #7542 use right panel 2024-06-07 09:52:44 +02:00
Javier Segarra ec5d5e52f4 Merge branch 'dev' into feature/ZoneCalendar 2024-06-07 09:32:51 +02:00
Alex Moreno a56df46678 fix(AccountAcls): fix and optimization 2024-06-07 09:07:58 +02: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 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
Jorge Penadés 5d041e2d03 fix: refs #6942 fix emit on reset 2024-06-06 12:14:00 +02:00
Jorge Penadés b27ae621f3 Merge branch 'dev' into 6891-addToggleFilterPanel 2024-06-06 08:45:12 +00: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 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 516b905305 feat: refs #7502 new icons v1.73 2024-06-06 08:38:19 +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
Carlos Satorres b852faf91f refs #6905 fix userPanel 2024-06-05 08:58:12 +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
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 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
Javi Gallego 5f00f3bad4 Merge branch 'dev' into 4560-gastos-reparto 2024-06-04 09:42: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