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

534 Commits

Author SHA1 Message Date
Alex Moreno d4c82073f8 Merge pull request 'refs #5988 Added left space to subsection' (!76) from 6080-leftSpaceSubsection into dev 
Reviewed-on: verdnatura/salix-front#76
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-08-09 10:11:35 +00:00
Guillermo Bonet 6d2436c9f7 refs #5988 Improved identation 2023-08-09 10:09:37 +02:00
Guillermo Bonet 8d4faa270b refs #5995 Added left space to subsection 2023-08-09 07:23:28 +02:00
Alex Moreno 68935f2a4d refs #6075 fix: add $props.value 2023-08-08 14:47:39 +02:00
Alex Moreno c75c404c29 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2023-08-08 08:47:40 +02:00
Alex Moreno c077b7cbcf Merge pull request 'TEST refs #6083 feat: ticketSms section' (!72) from 6083-ticketSms into test 
Reviewed-on: verdnatura/salix-front#72
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2023-08-08 06:47:12 +00:00
Alex Moreno 1f573b9922 refs #6083 feat: ticketSms section 2023-08-07 14:02:22 +02:00
Jorge Penadés b55e216d6a Merge pull request 'refs #6075 VnLabelValue created' (!68) from 6075-createVnLabelValue into dev 
Reviewed-on: verdnatura/salix-front#68
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2023-08-01 09:37:47 +00:00
Jorge Penadés 2549b20158 refs #6075 refactor changes 2023-07-31 15:31:29 +02:00
Jorge Penadés 0d67ac4450 refs #6075 VnLabelValue created 2023-07-31 14:09:07 +02:00
Alex Moreno 3431abae5d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2023-07-27 08:13:59 +02:00
Alex Moreno 2b08924a61 refs #6011 change version in package 2023-07-20 10:03:07 +02:00
Alex Moreno c3b657e649 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2023-07-20 10:01:50 +02:00
Carlos Satorres b0f4e23871 Merge pull request 'refs #5930 mod component' (!66) from 5930-claimBasicData into dev 
Reviewed-on: verdnatura/salix-front#66
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-07-10 06:16:50 +00:00
Carlos Satorres dcfc5f87c1 refs #5930 mod component 2023-07-10 06:04:05 +02:00
Alex Moreno 0ef1a0cbaa Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front 2023-07-06 14:17:22 +02:00
Carlos Satorres efa946596f Merge pull request '5832-232601-dev_test' (!65) from 5832-232601-dev_test into test 
Reviewed-on: verdnatura/salix-front#65
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>
 2023-06-26 06:06:20 +00:00
Alex Moreno f47e69c303 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2023-06-26 07:59:21 +02:00
Vicent Llopis bb4bf0e6db Merge pull request '5608-fixRedirectWhenIsUnauthorized' (!63) from 5608-fixRedirectWhenIsUnauthorized into dev 
Reviewed-on: verdnatura/salix-front#63
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-06-16 07:20:30 +00:00
Vicent Llopis 1895e4ff98 refs #5608 fix: use Router 2023-06-15 11:46:15 +02:00
Vicent Llopis 7ef16a69f2 refs #5608 fix: redirect cuando dice 'Authorization Required' 2023-06-15 11:37:54 +02:00
Alex Moreno 957f94272c Merge pull request '232201_test_to_master' (!62) from 232201_test_to_master into master 
Reviewed-on: verdnatura/salix-front#62
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
 2023-06-01 07:26:38 +00:00
Alex Moreno a7a5560308 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front 2023-06-01 09:24:54 +02:00
Alex Moreno 8f5a3b3876 Merge pull request '232201_dev_to_test' (!59) from dev into test 
Reviewed-on: verdnatura/salix-front#59
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
 2023-06-01 07:18:40 +00:00
Alex Moreno 5cf7bd95ec Merge pull request 'refs #5752' (!58) from 5752-fix-dev into dev 
Reviewed-on: verdnatura/salix-front#58
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
 2023-06-01 07:14:22 +00:00
Alex Moreno 1205f277fc refs #5752 2023-06-01 09:09:54 +02:00
Alex Moreno 0efbe1df52 Merge pull request 'refs #5668 update package.json' (!57) from 5668-update-node20 into dev 
Reviewed-on: verdnatura/salix-front#57
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2023-05-29 06:17:55 +00:00
Alex Moreno 7473a8a04c refs #5668 update package.json 2023-05-26 14:01:24 +02:00
Alexandre Riera 06645d941b Merge pull request 'fixes #5357 Convertir sección de histórico en componente reutilizable vnLog' (!48) from 5357-vnLog-component into dev 
Reviewed-on: verdnatura/salix-front#48
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2023-05-22 10:42:41 +00:00
Alexandre Riera a2cdddb17e Merge branch 'dev' into 5357-vnLog-component 2023-05-22 10:36:30 +00:00
Alexandre Riera ed7819c2bf Merge pull request 'fixes #5655 Afinar login' (!54) from 5655-afinar-login into dev 
Reviewed-on: verdnatura/salix-front#54
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2023-05-22 10:31:17 +00:00
Alexandre Riera a7b524f552 Merge branch 'dev' into 5655-afinar-login 2023-05-22 10:29:23 +00:00
Alexandre Riera a1ca8c822f Merge pull request 'fixes #4797 Seccion Worker/Notification' (!51) from 4797-worker-notification-selector into dev 
Reviewed-on: verdnatura/salix-front#51
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-05-15 09:42:16 +00:00
Alex Moreno 725e8db7d8 Merge branch 'dev' into 4797-worker-notification-selector 2023-05-15 09:37:49 +00:00
Alexandre Riera ecb83f24dc refs #4797 minor fixes 2023-05-15 10:57:17 +02:00
Alexandre Riera 4681cc17e4 Merge branch 'dev' into 5655-afinar-login 2023-05-12 07:46:26 +00:00
Alexandre Riera e2586bd6e1 refs #5655 fix test 2023-05-12 09:15:45 +02:00
Alex Moreno 049b281530 Merge pull request '231801 test to master' (!56) from test into master 
Reviewed-on: verdnatura/salix-front#56
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
 2023-05-12 06:35:12 +00:00
Alexandre Riera e254a1e721 refs #5655 useRole and useUserConfig independents 2023-05-11 14:51:12 +02:00
Alex Moreno 502f550a41 Merge pull request 'test to dev' (!55) from test into dev 
Reviewed-on: verdnatura/salix-front#55
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
 2023-05-11 12:14:48 +00:00
Alexandre Riera c4f40fbb59 refs #5655 fix unit test 2023-05-11 09:05:48 +02:00
Alex Moreno 06b76b3edc Merge pull request 'fix(icon): pin and pin_off' (!53) from fix_env into test 
Reviewed-on: verdnatura/salix-front#53
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
 2023-05-11 06:59:05 +00:00
Alexandre Riera 1627f9cd36 refs #5655 added useUserConfig 2023-05-11 08:55:34 +02:00
Alex Moreno 1b95280a32 fix icon class 2023-05-11 08:54:51 +02:00
Alexandre Riera f53745f1f7 refs #4797 fixing e2e 2023-05-10 14:24:47 +02:00
Alex Moreno 1768304d4f fix icons 2023-05-09 14:05:36 +02:00
Alexandre Riera 8a3df43684 Merge branch '4797-worker-notification-selector' of https://gitea.verdnatura.es/verdnatura/salix-front into 4797-worker-notification-selector 2023-05-09 11:45:18 +02:00
Alexandre Riera fd456ec559 refs #4797 fix unit test 2023-05-09 11:45:15 +02:00
Alex Moreno 642ad91f26 fix(jenkins): get env 2023-05-09 11:42:48 +02:00
Alex Moreno d43f7c0653 Merge pull request '231801_dev_to_test' (!52) from 231801_dev_to_test into test 
Reviewed-on: verdnatura/salix-front#52
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
 2023-05-08 10:31:09 +00:00