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
13,208 Commits 5 Branches 2 Tags
Commit Graph

13208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ogerly
fc75d4f370 rename computed disableButtomByUpdate to disableButtonByUpdate 2022-10-16 13:03:10 +02:00
ogerly
018cfc68b1 check groupForm disableButton if creat and update 2022-10-16 12:58:00 +02:00
Wolfgang Huß
95cb82da34 Make configurable header menu translatable 2022-10-15 16:11:28 +02:00
Wolfgang Huß
0794115b3f Release v1.1.2-XXX - configurable header menu is translatable 2022-10-15 15:57:36 +02:00
Wolfgang Huß
323826ca20 Add '/dns.values*-ME.yaml' to .gitignore 2022-10-15 15:05:08 +02:00
Wolfgang Huß
f4d440b86c Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding 2022-10-15 15:03:12 +02:00
Wolfgang Huß
a95e891e28
Merge pull request #80 from Ocelot-Social-Community/79-fix-implementation-of-overwriting-locales 
fix: 🍰 Fix Implementation Of Overwriting Locales
 2022-10-13 16:58:20 +02:00
Wolfgang Huß
4479fb4cbc Revert the publish branch 2022-10-13 16:55:39 +02:00
Wolfgang Huß
0cf00fdc07 Fix copy error by adding two empty JSON files to the locales 2022-10-13 15:13:34 +02:00
Wolfgang Huß
be603a5af2 Set this branch as publishing branch for testing purposes – revert later 2022-10-13 15:11:42 +02:00
Moriz Wahl
179907046f
Merge pull request #77 from Ocelot-Social-Community/merge-locales 
feat: 🍰 Merge Locales
 2022-10-12 18:10:48 +02:00
Moriz Wahl
a1ce804995 clean up 2022-10-12 16:29:20 +02:00
Moriz Wahl
ebf8894ca2 remove tmp folder, test for override of existing locales 2022-10-12 15:58:28 +02:00
Moriz Wahl
9045ac3199 add script to merge variables 2022-10-12 15:33:07 +02:00
Moriz Wahl
111b1da00d test jq to merge locale files 2022-10-11 18:59:52 +02:00
Moriz Wahl
51ce290195
Merge pull request #5380 from Ocelot-Social-Community/post-in-group 
feat: 🍰 Post In Groups
 2022-10-11 18:41:57 +02:00
Wolfgang Huß
527e90e919 Merge branch 'post-in-group' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5385-webapp-post-in-group 2022-10-11 17:14:21 +02:00
Moriz Wahl
7cb1663be7 change from role eq pending to usual, admin, owner includes role 2022-10-11 14:35:27 +02:00
Wolfgang Huß
5bc20a9419 Merge branch 'post-in-group' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5385-webapp-post-in-group 2022-10-11 14:15:44 +02:00
Moriz Wahl
631f34a2e5 improved code and tests as suggested by @tirokk, thanks for the great review! 2022-10-10 21:21:45 +02:00
Moriz Wahl
4556276351 fix: leaving public group keeps the posts in public group visible. Test leaving public group and visibility of posts in public group 2022-10-10 20:57:42 +02:00
Alexander Friedland
356627a257
Merge pull request #5418 from Ocelot-Social-Community/5397-Refine-Group-Creation-And-Group-Edit 
feat: 🍰 Refine Group Creation And Group Edit
 2022-10-10 08:16:31 +02:00
Wolfgang Huß
42f5df78e4 Cleanup 2022-10-07 23:34:43 +02:00
Wolfgang Huß
1703638dd6 Implement group indication headline for view and edit post page 2022-10-07 23:26:47 +02:00
Wolfgang Huß
fc4e67990b Implement visibility of posts on group profile 2022-10-07 13:14:12 +02:00
Wolfgang Huß
7b9b253211 Implement post creation in a group 2022-10-07 11:32:04 +02:00
ogerly
9528365cd4 add ds-space if update GroupForm 2022-10-07 06:58:21 +02:00
Moriz Wahl
4fdaa0da4e
Update backend/src/schema/resolvers/helpers/filterInvisiblePosts.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-10-06 13:13:23 +02:00
Moriz Wahl
a4cd7a8698 test search posts with groups 2022-10-05 21:54:52 +02:00
Moriz Wahl
74505a11c5 filter posts for group visibility on search posts 2022-10-05 17:57:01 +02:00
Wolfgang Huß
009558f5fc Remove unused variable 2022-10-05 16:59:46 +02:00
Wolfgang Huß
350d59bf12 Refine create and edit group form 2022-10-05 16:56:59 +02:00
Moriz Wahl
a924357a13 fix cypher when posts do not exist 2022-10-05 13:10:18 +02:00
Moriz Wahl
76bfe48476 implement and test post visibilty when leaving or changing the role in a group 2022-10-05 11:20:27 +02:00
Moriz Wahl
aa870b5020 searches need authorization as they are not working without user id in context 2022-10-05 08:57:13 +02:00
Moriz Wahl
ab5d308caa test profile page posts 2022-10-05 08:38:05 +02:00
Moriz Wahl
570d6c099d test filter posts 2022-10-05 08:27:35 +02:00
Moriz Wahl
67cba104b8 remove findPosts and findUsers as they are never used. 2022-10-05 08:09:21 +02:00
Wolfgang Huß
be9dbdbb76 Refine component 'my-social-media' in webapp 2022-10-04 11:04:50 +02:00
ogerly
68cb597fa6 Merge branch '5397-Refine-Group-Creation-And-Group-Edit' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 5397-Refine-Group-Creation-And-Group-Edit 2022-10-04 10:11:31 +02:00
ogerly
d4b5823cf1 fix lint 2022-10-04 10:11:07 +02:00
ogerly
cbedf6f046 change from review 2022-10-04 10:09:56 +02:00
Wolfgang Huß
a5c65faf15 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5137-refactor-social-media-and-mysomethinglist 
# Conflicts:
#	webapp/pages/settings/my-social-media.vue
 2022-10-04 10:08:29 +02:00
Wolfgang Huß
a676a1887e
Merge pull request #5419 from Ocelot-Social-Community/5059-groups/5318-implement-content-menu-group-profile 
feat: 🍰 Implement Content Menu On Group Profile
 2022-10-04 09:08:45 +02:00
Alexander Friedland
f94fc5d211
Update webapp/components/Group/GroupForm.vue 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-10-04 08:35:09 +02:00
Moriz Wahl
03434071b4 fix cypher to have signup verification to block posts of groups for new users 2022-10-04 05:44:11 +02:00
Moriz Wahl
275d196cb6 further testting for post visibility 2022-10-04 05:04:42 +02:00
Moriz Wahl
068d622c44 createPostMutation as function 2022-10-04 05:03:39 +02:00
Moriz Wahl
77125e404f createPostMutation as function 2022-10-04 05:03:02 +02:00
Moriz Wahl
4331c73414 test post invisibility for unauthenticated users 2022-10-04 02:28:42 +02:00