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

628 Commits

Author SHA1 Message Date
Alex Moreno e8775a9585 Merge pull request 'refs 5987 index cards and light mode' (!79) from 5987-redisgnCards into dev 
Reviewed-on: verdnatura/salix-front#79
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-08-17 08:41:56 +00:00
Alex Moreno 831dcfbf6d Merge branch 'dev' into 5987-redisgnCards 2023-08-17 08:39:50 +00:00
Jorge Penadés 76071240d1 refs 5987 var-colors fixed 2023-08-17 10:32:24 +02:00
Alex Moreno ab2e1f4553 refs #5990 fix(ticket_descriptor_summary): client.salePersone null value 2023-08-17 09:07:58 +02:00
Jorge Penadés b7e9aee1d5 refs 5987 var-colors 2023-08-17 08:50:10 +02:00
Alex Moreno 07d1801b5e Merge pull request '5990-reStyle_summary' (!82) from 5990-reStyle_summary into dev 
Reviewed-on: verdnatura/salix-front#82
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-08-17 05:44:48 +00:00
Alex Moreno 4f9cdd2112 refs #5990 feat(summarys): custom colors 2023-08-16 07:35:29 +02:00
Alex Moreno e383615092 refs #5990 feat(summarys): cusom colors 2023-08-16 07:28:47 +02:00
Jorge Penadés 96d0ba3e0a refs 5987 fix media queries 2023-08-14 15:18:59 +02:00
Alex Moreno c64ae1ccee refs #5990 feat(summarys): redesigned 2023-08-14 13:52:25 +02:00
Jorge Penadés 670882024a refs 6105 css refactoring 2023-08-14 09:00:21 +02:00
Alex Moreno 342d218d98 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5990-reStyle_summary 2023-08-14 07:28:02 +02:00
Jorge Penadés 787844a930 refs 5987 fixed cardList margin and breakpoint 2023-08-11 14:49:34 +02:00
Jorge Penadés 3d4aca52f8 refs 5987 center card descriptor item-list 2023-08-11 08:17:29 +02:00
Jorge Penadés 4318641bc6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5987-redisgnCards 2023-08-11 08:11:22 +02:00
Guillermo Bonet 96cfea8a41 Merge branch 'test' into dev 2023-08-11 07:48:25 +02:00
Guillermo Bonet 0b42eca8ea Merge branch 'master' into test 2023-08-11 07:45:54 +02:00
Guillermo Bonet 0df742ece0 Merge pull request '5995-i18nBugFixed' (!80) from 5995-i18nBugFixed into master 
Reviewed-on: verdnatura/salix-front#80
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-08-11 05:34:27 +00:00
Guillermo Bonet 3172a13d22 refs #5995 Fix traductions i18n 2023-08-11 06:31:07 +02:00
Guillermo Bonet e875dcb064 refs #5995 Bug i18n fixed 2023-08-11 06:28:38 +02:00
Jorge Penadés cb52bfe171 refs 5987 fix title descriptor and card body 2023-08-10 16:09:48 +02:00
Alex Moreno 63e15c96cb refs #5990 feat(cardSummary): add slot 2023-08-10 15:38:31 +02:00
Alex Moreno 30fe237ed3 refs #5995 test 2023-08-10 14:38:04 +02:00
Alex Moreno 0287c43b64 refs #5995 test 2023-08-10 14:33:25 +02:00
Alex Moreno 930c9cdef1 refs #5995 test 2023-08-10 14:18:13 +02:00
Alex Moreno fb7d1fc38e refs #5995 test 2023-08-10 14:10:57 +02:00
Jorge Penadés a194ec745b refs 5987 index cards and light mode 2023-08-10 13:20:32 +02:00
Alex Moreno 396b6d0298 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5990-reStyle_summary 2023-08-10 12:04:43 +02:00
Alex Moreno d9dd0a4931 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2023-08-10 11:02:36 +02:00
Alex Moreno 6097fb2516 refs #6054 package correct version 2023-08-10 11:01:27 +02:00
Alex Moreno 13dc57a89c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front 2023-08-10 11:00:35 +02:00
Alex Moreno efc672a183 refs #6080 fix: header summary color 2023-08-10 10:52:34 +02:00
Guillermo Bonet d854a3200c Merge pull request 'refs #5995 Added module route and external cmrs' (!75) from 5995-externalCmr into master 
Reviewed-on: verdnatura/salix-front#75
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-08-10 07:56:12 +00:00
Juan Ferrer fafacebcb1 Merge pull request '6076-2FA' (!70) from 6076-2FA into dev 
Reviewed-on: verdnatura/salix-front#70
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2023-08-10 07:42:03 +00:00
Juan Ferrer 2ead25c69b Merge branch 'dev' into 6076-2FA 2023-08-10 06:58:52 +00:00
Guillermo Bonet 9f29a64d4a refs #5995 Changed transitions 2023-08-10 08:37:15 +02:00
Guillermo Bonet a9851e3781 Merge pull request 'refs #6080 New left menu Salix' (!77) from 6080-leftMenuSalix into dev 
Reviewed-on: verdnatura/salix-front#77
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-08-10 05:52:07 +00:00
Guillermo Bonet 58372ef9e8 refs #5995 Href to lilium api link 2023-08-10 07:49:57 +02:00
Alex Moreno cab607f600 refs #6080 test(LeftMenu): undo skip 2023-08-10 07:26:50 +02:00
Guillermo Bonet 1bd6f4a7c7 Merge branch 'dev' into 6080-leftMenuSalix 2023-08-10 07:10:41 +02:00
Guillermo Bonet 45cfdc5edb refs #6080 Fixed tests 2023-08-10 07:06:35 +02:00
Alex Moreno 5417c1691a refs #5990 refactor: cardSummary 2023-08-09 15:16:00 +02:00
Alex Moreno 87d6304218 Merge branch 'dev' into 6076-2FA 2023-08-09 13:01:11 +00:00
Jorge Penadés 2816413eb6 Merge pull request '5986-redisgnDescriptors' (!73) from 5986-redisgnDescriptors into dev 
Reviewed-on: verdnatura/salix-front#73
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-08-09 12:59:35 +00:00
Jorge Penadés dd9b58a0ab Merge branch 'dev' into 5986-redisgnDescriptors 2023-08-09 12:57:26 +00:00
Alex Moreno 220847ef3a Merge branch 'dev' into 6076-2FA 2023-08-09 12:57:00 +00:00
Alex Moreno fbb347f719 refs #6080 test: skip Leftmenu 2023-08-09 14:54:32 +02:00
Alex Moreno df7366195a refs #5989 fix: revert appName 2023-08-09 14:42:37 +02:00
Guillermo Bonet df66903e49 refs #6080 Deleted unused function 2023-08-09 14:34:43 +02:00
Jorge Penadés ad17737947 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5986-redisgnDescriptors 2023-08-09 14:31:09 +02:00