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,490 Commits 117 Branches 1,511 Tags
Commit Graph

279 Commits

Author SHA1 Message Date
Wolfgang Huß
b23f4ea47b Implement descriptionExcerpt on group profile 2022-09-15 09:55:51 +02:00
Wolfgang Huß
6af9e0cec0 Merge branch '5059-groups/5318-group-profile-second' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5318-group-profile-members-list-etc 
# Conflicts:
#	webapp/locales/de.json
#	webapp/locales/en.json
 2022-09-14 16:18:37 +02:00
Wolfgang Huß
210aebb829 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5318-group-profile-second 2022-09-14 14:27:01 +02:00
Wolfgang Huß
6a9c040722 Implement 'LeaveGroup' resolver 2022-09-13 20:23:34 +02:00
Wolfgang Huß
ee026a3e15 Remove unused parameters in 'GroupMembers' query 2022-09-10 13:16:34 +02:00
Wolfgang Huß
5eabdf1495 Comment out unimplemented parameters in 'Group' resolver 2022-09-10 07:46:08 +02:00
Wolfgang Huß
36f6fee8be Query groups by 'Group' resolver via 'slug' and test it 2022-09-09 13:44:13 +02:00
Moriz Wahl
d05919fddb add active categories to current user query 2022-09-07 14:08:03 +02:00
Moriz Wahl
341e386207 linting 2022-09-07 13:37:48 +02:00
Moriz Wahl
d4c338e04e add save categories mutation 2022-09-06 18:50:33 +02:00
Wolfgang Huß
9b83b37ea3 Upload group avatar on group profile page 2022-09-06 09:14:28 +02:00
Wolfgang Huß
6280fa99cf Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5190-group-profile 2022-08-29 11:28:50 +02:00
Wolfgang Huß
e82d35c824 Fix linting 2022-08-25 23:17:50 +02:00
Wolfgang Huß
e1f4609c25 !!! Temp !!! 2022-08-23 04:48:38 +02:00
Wolfgang Huß
f6bfc8aa7f
Merge pull request #5143 from Ocelot-Social-Community/5142-rename-UserGroup-to-UserRole 
refactor: 🍰 Rename `UserGroup` To `UserRole`
 2022-08-09 09:02:27 +02:00
Wolfgang Huß
a8a6acb9f7 Rename 'UserGroup' to 'UserRole' 2022-08-03 08:14:05 +02:00
Moriz Wahl
bc955003f7 add optional categories to teaser and post 2022-07-25 20:03:00 +02:00
Wolfgang Huß
7ae5593f82 Implement user notifications settings 2021-09-22 14:05:10 +02:00
Wolfgang Huß
59dfb4662e Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4265-move-sort-newsfeed-menu-into-filter-menu 2021-05-06 16:04:09 +02:00
Wolfgang Huß
d40dd94868 Implement showDonations in the database 
- Add to backend tests.
 2021-04-15 10:51:01 +02:00
Ulf Gebhardt
589fe438e2
fix Search.feature 2021-04-12 13:24:53 +02:00
Wolfgang Huß
266ed76639 Implement 'inviteCode' in webapp calling Mutations 'Signup', 'SignupVerify' 
- Replace in calls of 'setSliderValuesCallback' 'this.sliderData.sliders[this.sliderIndex].validated' by 'null', because validation does not change.
 2021-03-09 11:09:32 +01:00
Moriz Wahl
1c3f628fb2 count views of post teaser 2021-03-01 15:33:20 +01:00
Moriz Wahl
88fd83ec2b
Merge pull request #4248 from Ocelot-Social-Community/count-post-views 
feat: 🍰 Count Post Clicks
 2021-03-01 14:55:14 +01:00
Moriz Wahl
96066eae02 tests fixed for clickedCount 2021-02-22 22:23:56 +01:00
Moriz Wahl
d3eafc9b69 add clickedCount to PostTeaser 2021-02-22 21:13:24 +01:00
Moriz Wahl
a5df793c55 avoid introspection to get available roles as admin 2021-02-16 13:12:18 +01:00
Moriz Wahl
c528269cb2
change user roles is working, test fails 2021-02-10 13:08:42 +01:00
Moriz Wahl
9ef42940ae
change user roles: fixed mutation parameters, added success toast 2021-02-10 13:08:42 +01:00
Wolfgang Huß
567758bc56
Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4124-switch-user-role 2021-02-10 13:08:41 +01:00
Moriz Wahl
55983db2ca
Merge pull request #4199 from Ocelot-Social-Community/1934-image-cropping-optional 
feat: Image Cropping Is Optional
 2021-02-09 16:20:03 +01:00
Moriz Wahl
664d3d2c42 image type in frontend 2021-02-04 21:05:04 +01:00
Ulf Gebhardt
31038c5c2a
- lint fixes 2021-02-02 02:48:31 +01:00
Ulf Gebhardt
c0b25040c3
- frontend implementation location query 
- remove mapboxtoken from .env template
 2021-02-02 02:48:31 +01:00
Wolfgang Huß
7ffd8c59cb Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 2144-Add_Search_Results_Page 2021-01-25 08:24:47 +01:00
narendra chandra
d5e227a38a Added user role change feature 2021-01-24 21:07:45 -05:00
Moriz Wahl
250d231a74
auto detect language. Input field in contribution form removed. 2021-01-21 13:30:56 +01:00
Wolfgang Huß
7dbc833e22 Merge branch '2144-Add_Search_Results_Page' of https://github.com/Human-Connection/Human-Connection into HC-2144-Add_Search_Results_Page 
# Conflicts:
#	webapp/pages/profile/_id/_slug.vue
 2021-01-18 14:12:13 +01:00
Moriz Wahl
f9518619fe id for author added 2020-10-14 16:35:47 +02:00
Moriz Wahl
8e527a83f1 post categories added for data export 2020-10-14 00:14:56 +02:00
Wolfgang Huß
c91c9e263f Implement mixins for delete, pin, unpin post in lists, on the way 2020-10-08 09:26:20 +02:00
Moriz Wahl
f0354c337f Export of user data as XML 2020-09-29 15:54:21 +02:00
Moriz Wahl
0e678a5559 basic json download of user data 2020-09-29 13:35:47 +02:00
ogerly
1c1a0030f7 fix: i have taken over and implemented the proposals from tirrok 2020-08-04 13:08:11 +02:00
Moriz Wahl
da801d6410 Removed category fragments form search gql 2020-06-02 15:43:56 +02:00
ogerly
b2326c710e git pull conflicts fixed 2020-04-29 10:10:14 +02:00
ogerly
7e5a7f5d42 bug: deleteUser on old status, currentUserCounts are retrieved additionally, admin cannot delete himself via his user settings 2020-04-29 10:04:54 +02:00
ogerly
8a2d238f96 fix: #3498 Checkboxes missing on delete user account page 2020-04-26 13:11:32 +02:00
ogerly
6e934ed6b2 merge: master ok 2020-04-22 10:05:09 +02:00
Moriz Wahl
7562af227e pages are counted correctly 2020-04-14 21:41:45 +02:00