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

660 Commits

Author SHA1 Message Date
Alex Moreno 50ae75ac17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-08-23 08:37:49 +02:00
Alex Moreno 98552bcd9e refs #5673 test(CrudModel): front and e2e 2023-08-21 15:14:19 +02:00
Alex Moreno da39243cab Merge pull request 'refs #6082 navBar' (!74) from 6082-refactNavBar into dev 
Reviewed-on: verdnatura/salix-front#74
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-08-21 10:53:01 +00:00
Alex Moreno 3105f1cef6 Merge branch 'dev' into 6082-refactNavBar 2023-08-21 10:51:26 +00:00
Carlos Satorres 89b01759ba Merge branch '6082-refactNavBar' of https://gitea.verdnatura.es/verdnatura/salix-front into 6082-refactNavBar 2023-08-21 12:50:03 +02:00
Carlos Satorres 36a487a9fc refs #6082 navBar fix mobile 2023-08-21 12:50:01 +02:00
Alex Moreno afddb8f990 refs #5987 fix button color 2023-08-18 14:03:39 +02:00
Alex Moreno 6c8329ec53 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-08-18 09:01:04 +02:00
Alex Moreno c2b10ba271 Merge pull request '5987-fixCardListActions' (!84) from 5987-fixCardListActions into dev 
Reviewed-on: verdnatura/salix-front#84
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-08-18 06:58:50 +00:00
Jorge Penadés 746bb8962d refs 5987 workerList test fixed 2023-08-17 15:36:06 +02:00
Alex Moreno ee9319de11 refs #5673 test: add crudModel test 2023-08-17 15:32:56 +02:00
Jorge Penadés 10efafaad8 refs 5987 cardList css refactored 2023-08-17 14:48:05 +02:00
Jorge Penadés 59f2f1a414 ref 5987 cardLists actions click propagation fixed 2023-08-17 13:38:21 +02:00
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
Alex Moreno a307486fcd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-08-17 09:01:07 +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 edb96ebf5f Merge branch 'dev' into 6082-refactNavBar 2023-08-17 05:03:09 +00:00
Alex Moreno c139e8034b refs #5673 feat(CrudModel): separate from FormModel 2023-08-16 15:04:16 +02: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 4207e564be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-08-14 14:17:52 +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
Carlos Satorres 499ca540c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6082-refactNavBar 2023-08-10 12:35:28 +02:00
Carlos Satorres a63a24e5e6 refs #6082 none 2023-08-10 12:30:21 +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