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

3793 Commits

Author SHA1 Message Date
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 b54cb73c91 Merge pull request 'Zone Calendar' (!411) from hyervoni/salix-front-mindshore:feature/ZoneCalendar into dev 
Reviewed-on: verdnatura/salix-front#411
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-07 07:40:00 +00:00
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
Alex Moreno a56df46678 fix(AccountAcls): fix and optimization 2024-06-07 09:07:58 +02:00
Pablo Natek 68e49e2ffa fix: refs #7129 fix some issues on load and tools 2024-06-07 07:52:50 +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 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
Javier Segarra a26401d8eb feat: hide ID 2024-06-06 23:51:45 +02:00
Javier Segarra e178778264 fix: styles 2024-06-06 23:46:26 +02:00
Javier Segarra fe3ad9dc08 fix: styles and i18n 2024-06-06 23:40:52 +02:00
Javier Segarra 17924dfeb3 fix: styles and i18n 2024-06-06 23:39:38 +02:00
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
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
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
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
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
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