IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,943 Commits 5 Branches 2 Tags
Commit Graph

11943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
937954b6f6 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 
# Conflicts:
#	webapp/layouts/default.vue
 2022-10-21 11:23:27 +02:00
Wolfgang Huß
1d9c24db24 Fix tests of group profile page 2022-10-21 11:12:32 +02:00
Wolfgang Huß
4f2ea8ef3c Refine and synchronize group slug on group profile with user slug on user profile 2022-10-21 11:12:05 +02:00
Wolfgang Huß
294da3048f Refine 'in' text between user slug and group slug in user teaser 2022-10-21 11:11:03 +02:00
Wolfgang Huß
daea147772 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5523-make-click-on-logo-configurable 
# Conflicts:
#	webapp/layouts/default.vue
 2022-10-21 10:40:56 +02:00
Moriz Wahl
dd19eadaf3
Merge pull request #5527 from Ocelot-Social-Community/category-filter-in-filter-menu 
refactor: 🍰 Category Filter In Filter Menu
 2022-10-21 08:29:21 +02:00
Alexander Friedland
e68952b17e
Merge pull request #5512 from Ocelot-Social-Community/5384-Group-Invitation 
feat: 🍰 Group Invitation
 2022-10-21 06:54:50 +02:00
ogerly
de33b2288d fix lint 2022-10-20 16:01:16 +02:00
ogerly
af5447e830 coverage 65.14%, add specs GroupList.spec, GroupMember.spec 2022-10-20 15:58:34 +02:00
Moriz Wahl
c0ed1226d6
Merge pull request #5468 from Ocelot-Social-Community/5059-groups/5385-webapp-post-in-group 
feat: 🍰 Implement Post In Group In Webapp
 2022-10-20 13:19:18 +02:00
Ulf Gebhardt
56850f7790
include in between user and group link -> @user in &group 2022-10-20 12:54:07 +02:00
Ulf Gebhardt
759ec89731
corrected & for groups instead of @ 2022-10-20 12:37:47 +02:00
Ulf Gebhardt
a04693d915
Merge pull request #5508 from Ocelot-Social-Community/update_issue_templates 
feat:  🍰 Update Issue Templates
 2022-10-20 10:54:10 +02:00
ogerly
e4c3f9b729 mobile hamburger menu if 810px 2022-10-20 09:43:55 +02:00
ogerly
5257535b85 item output removed 2022-10-20 09:40:15 +02:00
Wolfgang Huß
5b6e3a0fda Lower webapp coverage from 65% to 64% 2022-10-20 07:45:50 +02:00
Wolfgang Huß
0158850793 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5385-webapp-post-in-group 2022-10-20 07:44:49 +02:00
Wolfgang Huß
1c3a592078 Lower webapp coverage from 65% to 64% 2022-10-20 07:34:18 +02:00
ogerly
000352f3cd filter menu only show on index 2022-10-19 21:22:43 +02:00
Wolfgang Huß
d2238269d1 Merge branch '5059-groups/5385-webapp-post-in-group' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5501-add-group-link-to-posts-in-webapp 2022-10-19 19:15:40 +02:00
Wolfgang Huß
1d0b187d5d Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5501-add-group-link-to-posts-in-webapp 2022-10-19 19:01:28 +02:00
Wolfgang Huß
25c1c7ff90 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-10-19 19:01:01 +02:00
Wolfgang Huß
08463405cf Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5501-add-group-link-to-posts-in-webapp 2022-10-19 19:00:37 +02:00
Wolfgang Huß
fc32a5f1aa Add new user teaser options to storybook 2022-10-19 18:59:26 +02:00
Wolfgang Huß
d1585bf23c Add group to user teaser on post teaser at user and group profile 2022-10-19 18:58:43 +02:00
ogerly
3aebace584 fix lint 2022-10-19 14:24:55 +02:00
ogerly
41e0cc5d3c dynamic header menu to mobile version 2022-10-19 14:24:04 +02:00
Moriz Wahl
43bf1ae79d refactor: Category Filter in Filter Menu 2022-10-19 13:44:17 +02:00
Wolfgang Huß
2eb5995116 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5501-add-group-link-to-posts-in-webapp 2022-10-19 13:36:46 +02:00
Wolfgang Huß
b0838d9bf6 Cleanup 2022-10-19 13:29:17 +02:00
ogerly
b6fa79594c add components PageParamsLink.vue in layouts default 2022-10-19 12:58:50 +02:00
Wolfgang Huß
419ac06d9c Implement 'LOGO_HEADER_CLICK' as configuration 2022-10-19 12:57:21 +02:00
ogerly
5200a2c6fd fist step mobile footer menu to heder menu 2022-10-19 12:19:47 +02:00
Moriz Wahl
89e1de0f14 mock route query group id 2022-10-19 09:28:15 +02:00
Moriz Wahl
7b69a4dc3f deactivate deprecated test 2022-10-19 09:24:08 +02:00
Moriz Wahl
25001ce6ab mock route params 2022-10-19 09:21:08 +02:00
Moriz Wahl
61ae38065c add callback for data object to Wrapper function 2022-10-19 09:14:42 +02:00
Moriz Wahl
78f03daf42 add groupId to variables in spec 2022-10-19 09:14:17 +02:00
Alexander Friedland
138f9a1c6f
Merge pull request #5489 from Ocelot-Social-Community/5472-Disable-Submit-Button-On-Group-Update-Changed-Error 
refactor: 🍰 Disable Submit Button On group Update Changed Error
 2022-10-19 06:43:53 +02:00
ogerly
79644cb60a add locals for group member 2022-10-18 19:29:48 +02:00
Wolfgang Huß
490c7bf2bf Refine logic of location 2022-10-18 19:12:01 +02:00
Wolfgang Huß
ab6b5ad219 Fix 'ds-chip' 'color' error 2022-10-18 18:28:52 +02:00
Wolfgang Huß
4521c71718 Fix location bugs 2022-10-18 18:14:38 +02:00
ogerly
3c4d4bb8eb style flex find user per slug 2022-10-18 14:43:29 +02:00
ogerly
548dcaaf6e dynamic load by add new group member per slug 2022-10-18 14:23:14 +02:00
ogerly
a8cf6acd93 add slug user to group member 2022-10-18 13:38:05 +02:00
Moriz Wahl
7412ec9b5b
Merge pull request #5503 from Ocelot-Social-Community/seed-posts-in-groups 
feat: 🍰 Seed Posts In Groups
 2022-10-18 13:18:39 +02:00
Wolfgang Huß
589938a829
Merge pull request #5491 from Ocelot-Social-Community/5490-make-header-menu-configuration-translatable 
feat: 🍰 Make Configurable Header Menu Translatable
 2022-10-18 12:48:08 +02:00
Ulf Gebhardt
d33bac1f4a
updated issue templates to the latest version of https://github.com/ulfgebhardt/issue-templates - featuring release and some minor updates 2022-10-18 10:53:45 +02:00
ogerly
2755ca6562 change location in group update 2022-10-18 09:54:45 +02:00