ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,983 Commits 117 Branches 1,511 Tags
Commit Graph

2096 Commits

Author SHA1 Message Date
Wolfgang Huß
18e9d5488a
Merge pull request #5593 from Ocelot-Social-Community/5580-make-donation-bar-configurable 
feat: 🍰 Make Donation Progress Bar Color Configurable
 2022-10-27 14:14:25 +02:00
Wolfgang Huß
932572049b Fix not correct working change of slug in group settings 2022-10-27 12:27:51 +02:00
ogerly
8c7005f643 change font-size and filter icon size 2022-10-27 12:00:08 +02:00
ogerly
baaa61761d change width, oderBy slug_asc 2022-10-27 11:40:22 +02:00
Wolfgang Huß
b43d49bfa9 Make donation progress bar color configurable 2022-10-27 10:07:02 +02:00
ogerly
655f1a26c8 add space in register box 2022-10-27 09:18:47 +02:00
ogerly
613812e3e9 resolve conflict after merge Make-Header-Menu-To-Component 2022-10-27 09:06:57 +02:00
Alexander Friedland
34839b5311
Merge branch 'master' into Make-Header-Menu-To-Component 2022-10-27 09:03:26 +02:00
ogerly
bad97a2fca fix lint 2022-10-27 08:50:37 +02:00
ogerly
1dfdc61220 footer links target dynamic 2022-10-27 08:48:58 +02:00
ogerly
c62e49fef3 merge Make-Header-Menu-To-Component, resolve conflict 2022-10-27 08:27:19 +02:00
ogerly
31a4be9375 add target url dynamic 2022-10-27 08:24:20 +02:00
Wolfgang Huß
a69e155ef9 Fix slug indicator character '@' → '&' on the group teaser 2022-10-26 18:37:01 +02:00
Wolfgang Huß
73b91a5f04 Fix visibility of the role chip on the group teaser 2022-10-26 18:26:13 +02:00
Moriz Wahl
3bf26de650 rename route from my-groups to groups 2022-10-26 14:18:33 +02:00
Wolfgang Huß
b9488d7d7a Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-10-25 13:33:11 +02:00
Susmit Mukherjee
9928e4aaf3
Merge pull request #5559 from Ocelot-Social-Community/branchissue#5427 
fix: [WIP] 🍰 Long Words Are Being Wrapped Now
 2022-10-25 01:35:41 +05:30
Susmit Mukherjee
917c20c7c7 Addressed issue #5427,Long words are being wrapped now 2022-10-23 22:14:18 +05:30
Moriz Wahl
88b5fb9b46 have i18n as option for search groups, fix test 2022-10-23 13:02:04 +02:00
Moriz Wahl
e27f9b00e6 remove location from group fragment, remove search type from search string on search page 2022-10-23 01:18:58 +02:00
Moriz Wahl
9cffe4f275
Update webapp/components/generic/SearchGroup/SearchGroup.vue 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-10-23 00:53:56 +02:00
Moriz Wahl
7102de6e52
Update webapp/components/generic/SearchGroup/SearchGroup.vue 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-10-23 00:53:41 +02:00
Moriz Wahl
19aa01f83f
Update webapp/components/generic/SearchGroup/SearchGroup.vue 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-10-23 00:53:22 +02:00
Wolfgang Huß
f90d671245 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into search-groups 2022-10-22 18:07:35 +02:00
Wolfgang Huß
5434bbf6c6 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 
# Conflicts:
#	webapp/layouts/default.vue
 2022-10-22 12:29:59 +02:00
ogerly
15561cb94f fix lint 2022-10-22 09:36:18 +02:00
ogerly
401f59ae8d add header menu to component, central variabl for screen width 2022-10-22 09:35:27 +02:00
Wolfgang Huß
1421973a9f Fix Cypress test 'I_click_on_the_author.js' 2022-10-22 08:41:27 +02:00
Moriz Wahl
d1b05b7e02 add groups to search result page 2022-10-21 18:35:21 +02:00
Moriz Wahl
522cd8ef9e search for groups 2022-10-21 17:52:33 +02:00
Alexander Friedland
fc7bbede1d
Update webapp/components/PageFooter/PageFooter.vue 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-10-21 13:44:22 +02:00
ogerly
5f89017cea mobile menu check, delete topic 2022-10-21 12:23:41 +02:00
Wolfgang Huß
9773a7b4ba 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-21 11:34:31 +02:00
Wolfgang Huß
46e4d1d945 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-10-21 11:30:41 +02:00
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ß
294da3048f Refine 'in' text between user slug and group slug in user teaser 2022-10-21 11:11:03 +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
Ulf Gebhardt
56850f7790
include in between user and group link -> @user in &group 2022-10-20 12:54:07 +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ß
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ß
fc32a5f1aa Add new user teaser options to storybook 2022-10-19 18:59:26 +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
ogerly
5200a2c6fd fist step mobile footer menu to heder menu 2022-10-19 12:19:47 +02:00
Moriz Wahl
78f03daf42 add groupId to variables in spec 2022-10-19 09:14:17 +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