2096 Commits

Author SHA1 Message Date
Moriz Wahl
e2ac3ba846 sort categories on group profile 2022-11-28 14:02:37 +01:00
Moriz Wahl
5c3d9d893d add sort categories to category filter menu 2022-11-28 13:46:40 +01:00
Moriz Wahl
bd9a7d1e1b sort categories as mixin 2022-11-28 13:44:07 +01:00
Moriz Wahl
269f5bd741
Update webapp/components/CategoriesSelect/CategoriesSelect.vue
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-11-28 12:18:41 +01:00
Moriz Wahl
1d5f0f68e3 feat(webapp): sort categories by name 2022-11-24 19:12:17 +01:00
Moriz Wahl
e0b7d34745 esnure that username is correct 2022-11-23 18:06:50 +01:00
Moriz Wahl
287e5c29ea changes suggested by @tirokk 2022-11-23 17:53:43 +01:00
Moriz Wahl
b7c620c78c clear input field after select 2022-11-23 09:47:13 +01:00
Moriz Wahl
8bf22921cf use variable spacing instead of fix value in css 2022-11-22 12:40:13 +01:00
Moriz Wahl
3c4eb2fc91 Merge branch 'master' into search-users-to-add-to-group 2022-11-22 12:31:56 +01:00
Moriz Wahl
5adf6b387d do not open modal if selected user is already member of group 2022-11-22 12:29:56 +01:00
Moriz Wahl
0d160c0280 add modal to add group member confrimation 2022-11-22 12:24:02 +01:00
SvFedoriv
e34ee1a259 Centrelize mobile hamburer menu 2022-11-15 08:52:35 +01:00
ogerly
fc93017498 fix lint 2022-11-10 10:28:31 +01:00
ogerly
42d14421e0 style dropdwon search menu outside cards 2022-11-10 10:23:51 +01:00
Moriz Wahl
b5ed19a72a feat(webapp): Search Users to Add to Group 2022-11-08 09:03:38 +01:00
Moriz Wahl
55003447e5 check if user is member before adding user to group 2022-11-07 16:58:21 +01:00
ogerly
52dcd772fa comment out LanguagesFilter, EmotionsFilter, fix tests, fix lint 2022-10-28 14:24:57 +02:00
ogerly
e7fe6a9d3d Merge remote-tracking branch 'origin/master' into 5540-Refactor-Design-Of-Category-Filter-In-Filter-Menu 2022-10-28 13:46:38 +02:00
ogerly
bf87033b33 Merge remote-tracking branch 'origin/master' into 5540-Refactor-Design-Of-Category-Filter-In-Filter-Menu 2022-10-28 13:44:47 +02:00
ogerly
128a98cc27 unused slot sidebar in filter menu, an d style 2022-10-28 13:39:16 +02:00
ogerly
2532dae733 fix lint 2022-10-28 13:16:20 +02:00
Wolfgang Huß
f7cc020feb Fix linting 2022-10-28 13:15:44 +02:00
ogerly
c0bab3cd50 fix test 2022-10-28 13:15:44 +02:00
Wolfgang Huß
48d6bf6bd1 Remove commented 'deleteMember' 2022-10-28 13:14:55 +02:00
Wolfgang Huß
65431c2baf Merge branch '5545-Footer-And-Header-Links-Configurable' of github.com:Ocelot-Social-Community/Ocelot-Social into 5545-Footer-And-Header-Links-Configurable
# Conflicts:
#	webapp/components/Group/GroupMember.vue
2022-10-28 13:13:53 +02:00
Wolfgang Huß
27589a64ba Fix target property in 'HeaderMenu.vue' 2022-10-28 13:08:39 +02:00
Wolfgang Huß
ed48656d8a Revert to have header menu groups button again 2022-10-28 12:48:58 +02:00
Wolfgang Huß
b20b797d60 Fix target property in 'PageParamsLink.vue' 2022-10-28 12:48:27 +02:00
ogerly
9b7dc2cac7 fix lint 2022-10-28 12:27:04 +02:00
Wolfgang Huß
ffb508806b Disable remove group member button, because this doesn't work yet 2022-10-28 12:10:57 +02:00
Wolfgang Huß
f5f3fbeadb Fix linting 2022-10-28 12:05:45 +02:00
ogerly
8c1c260418 menu filter clear position of buttons 2022-10-28 12:05:23 +02:00
Wolfgang Huß
00c10cc1a7 Refine footer links and donation link and fix their tests 2022-10-28 11:50:15 +02:00
Wolfgang Huß
9bf0e26731 Merge branch 'Make-Header-Menu-To-Component' of github.com:Ocelot-Social-Community/Ocelot-Social into 5545-Footer-And-Header-Links-Configurable 2022-10-28 10:13:52 +02:00
Wolfgang Huß
6d3c7f0acb Simplify usage of 'LOGOS.LOGO_HEADER_CLICK.externalLink.target' 2022-10-28 10:12:39 +02:00
Wolfgang Huß
6c45b1f3a1 Merge branch 'Make-Header-Menu-To-Component' of github.com:Ocelot-Social-Community/Ocelot-Social into 5545-Footer-And-Header-Links-Configurable 2022-10-28 09:14:08 +02:00
Wolfgang Huß
ef97b4c388 Fix a merging left over with header logo click and fix functionallity on empty string targets 2022-10-28 09:11:01 +02:00
ogerly
709c9b1073 fix lint 2022-10-28 08:48:29 +02:00
ogerly
0c9fcaa5c6 test coverage to 64% 2022-10-28 08:47:55 +02:00
Wolfgang Huß
c30d27bd6c Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into Make-Header-Menu-To-Component 2022-10-28 08:09:26 +02:00
Alexander Friedland
e55917c7c6
Merge pull request #5591 from Ocelot-Social-Community/4744-Missing-Space-On-Registration-Slider
fix: 🍰 Add Space In Register Box
2022-10-27 18:36:16 +02:00
Wolfgang Huß
09cb120f92 Add 'ds-spaces' to the other registration slider components 2022-10-27 16:03:13 +02:00
ogerly
533eef0f37 remove unused code 2022-10-27 15:46:41 +02:00
ogerly
75ff8f5eba fix lint 2022-10-27 15:30:06 +02:00
ogerly
20ca2eca39 change style for button position 2022-10-27 15:29:21 +02:00
ogerly
93add91e77 fix lint 2022-10-27 15:23:19 +02:00
ogerly
76ad2ec063 change <space-xx-small /> to <ds-space margin=xxx-small /> 2022-10-27 15:22:22 +02:00
ogerly
4c4e67bcf7 filter category save and all button in on line 2022-10-27 15:17:27 +02:00
ogerly
d0e298ad26 Merge branch 'Make-Header-Menu-To-Component' into 5540-Refactor-Design-Of-Category-Filter-In-Filter-Menu 2022-10-27 14:21:21 +02:00