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

11340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
fa79c25e9b Implement join button on Group profile, a start 2022-09-07 11:12:34 +02:00
Wolfgang Huß
d11b512bfb Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5190-group-profile 2022-09-07 08:32:05 +02:00
Wolfgang Huß
705ab9a0a3
Merge pull request #5224 from Ocelot-Social-Community/5059-groups/5131-implement-update-group-resolver 
feat: 🍰 Implement `UpdateGroup` Resolver
 2022-09-06 19:51:43 +02:00
Wolfgang Huß
b2f0c0677d Fix typo after Moriz suggestion 
Co-Authored-By: Mogge <moriz.wahl@gmx.de>
 2022-09-06 10:39:56 +02:00
Wolfgang Huß
9b83b37ea3 Upload group avatar on group profile page 2022-09-06 09:14:28 +02:00
Wolfgang Huß
b96dfa84e0 Merge branch '5059-groups/5131-implement-update-group-resolver' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5190-group-profile 
# Conflicts:
#	backend/src/schema/resolvers/groups.spec.js
 2022-09-05 10:59:21 +02:00
Wolfgang Huß
685ef85752 Test 'Group' with 'categories' as result 
- Cleanup.
 2022-09-05 09:30:35 +02:00
Wolfgang Huß
5f081cdb0d Refine test descriptions for groups 
- Cleanup.
 2022-09-05 09:19:07 +02:00
Wolfgang Huß
92e6cc3f1b Cleanup 2022-09-05 09:13:47 +02:00
Wolfgang Huß
e713f65522 Refine groups testing 2022-09-05 09:01:42 +02:00
Wolfgang Huß
bfc60bcbf0 Test 'UpdateGroup' with 'categoryIds', remainders 2022-09-02 08:13:53 +02:00
Wolfgang Huß
999bbd85c1 Add more slugification tests for 'CreateGroup' and 'UpdateGroup' 2022-09-02 08:11:40 +02:00
Wolfgang Huß
7ec6086915 Test 'UpdateGroup' in general resolver and 'Group' resolver with 'id' 2022-09-02 08:10:46 +02:00
Wolfgang Huß
b82dcd45aa Add a missing await in 'posts.spec.js' 2022-09-02 05:35:52 +02:00
Wolfgang Huß
da66aa4852 Test 'UpdateGroup' resolver, a start 2022-09-01 15:33:28 +02:00
Wolfgang Huß
4f7ce5a6c1 Fix slugification tests of 'UpdateGroup' 2022-09-01 15:04:49 +02:00
Wolfgang Huß
44eb9d0bde Implement 'UpdateGroup' resolver, not working 2022-09-01 09:31:50 +02:00
Wolfgang Huß
a1c7ba6129 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5131-implement-update-group-resolver 2022-08-31 09:23:32 +02:00
Wolfgang Huß
a5878ab505 Fix linting 2022-08-31 09:22:38 +02:00
Wolfgang Huß
2814f81ed5 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5131-implement-update-group-resolver 
# Conflicts:
#	backend/src/db/graphql/groups.js
#	backend/src/middleware/permissionsMiddleware.js
 2022-08-31 09:21:08 +02:00
Wolfgang Huß
a8f59a4c42 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 
# Conflicts:
#	backend/src/constants/categories.js
#	backend/src/db/seed.js
 2022-08-31 09:02:26 +02:00
Wolfgang Huß
422d818133 !!! Temp !!! 2022-08-31 08:51:01 +02:00
Wolfgang Huß
99f053205a
Merge pull request #5198 from Ocelot-Social-Community/categories-filter-menu 
feat: Categories Filter Menu
 2022-08-31 08:44:56 +02:00
Wolfgang Huß
244cb590e3
Merge pull request #5199 from Ocelot-Social-Community/5059-groups/5188-query-members-of-group 
feat: 🍰 Implement `JoinGroup`, `GroupMember`, `SwitchGroupMemberRole` Resolvers
 2022-08-30 10:28:26 +02:00
Moriz Wahl
c61e983102 remove double console log 2022-08-30 10:21:15 +02:00
Moriz Wahl
0d1da0d83d
Update backend/src/db/migrate/store.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-08-30 10:14:39 +02:00
Moriz Wahl
3e6cabaa1c
Update backend/src/db/migrate/store.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-08-30 10:13:56 +02:00
Wolfgang Huß
fa2e92a363 Refine tests in 'slugifyMiddleware.spec.js' 2022-08-30 08:25:56 +02:00
Wolfgang Huß
d969141fc6 Implement 'UpdateGroup' resolver, first step 2022-08-30 06:58:39 +02:00
Wolfgang Huß
b9e59badb0 Add avatar to group page 2022-08-30 06:27:37 +02:00
Wolfgang Huß
aa09ac29dc Fix tests 2022-08-29 19:53:59 +02:00
Wolfgang Huß
5f43a51c6a Rename prop 'user' of 'profile-avatar' to 'profile' 2022-08-29 18:39:51 +02:00
Wolfgang Huß
615ee2991a Rename Component from 'UserAvatar' as 'user-avatar' to 'ProfileAvatar' as 'profile-avatar' 2022-08-29 18:21:50 +02:00
Wolfgang Huß
077a63aca7 Rename class 'user-avatar' to 'profile-avatar' 2022-08-29 18:09:51 +02:00
Wolfgang Huß
2fc84f9c36 Rename class 'profile-avatar' to 'profile-page-avatar' 2022-08-29 13:45:30 +02:00
Wolfgang Huß
a9c52bfcae Renamed 'AvatarUploader' property from 'user' to 'profile' 
- Rename several CSS.
 2022-08-29 13:03:43 +02:00
Wolfgang Huß
ac0aacf776 Rename 'hc-upload' or 'Upload' to AvatarUploader and moved 'ImageUploader' to folder 'Uploader' 2022-08-29 12:10:23 +02:00
Wolfgang Huß
d1b940b332 Implement 'groupSince' and 'groupGoal' in group profile 2022-08-29 11:50:06 +02:00
Wolfgang Huß
f678dad50a Fix linting 2022-08-29 11:32:20 +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ß
23512c6e96 Merge branch '5059-groups/5190-group-profile' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5190-group-profile 
# Conflicts:
#	webapp/graphql/groups.js
 2022-08-29 11:28:35 +02:00
Wolfgang Huß
39487778bf Implement group profile, first step 2022-08-29 11:26:27 +02:00
Wolfgang Huß
623af5f47b Query for group 'id' directly in resolver 2022-08-29 11:18:40 +02:00
Wolfgang Huß
10d88df02c Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5188-query-members-of-group 
# Conflicts:
#	backend/src/schema/resolvers/groups.spec.js
 2022-08-29 10:03:46 +02:00
Wolfgang Huß
6beb69052f Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-08-29 09:58:55 +02:00
Wolfgang Huß
81b763c732
Merge pull request #5217 from Ocelot-Social-Community/5216-fix-test-description-from-enter-nonce-to-change-password 
fix: 🍰 Fix Test Description From `enter-nonce.vue` To `change-password`
 2022-08-29 09:16:17 +02:00
Wolfgang Huß
7f484b7143
Merge pull request #5218 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.2.2 
Bump cookie-universal-nuxt from 2.1.5 to 2.2.2 in /webapp
 2022-08-29 09:10:21 +02:00
Wolfgang Huß
e2c6902433 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.2.2 2022-08-27 19:31:57 +02:00
dependabot[bot]
3607ed4b68
Bump cookie-universal-nuxt from 2.1.5 to 2.2.2 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.1.5 to 2.2.2.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.1.5...v2.2.2)

---
updated-dependencies:
- dependency-name: cookie-universal-nuxt
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-27 14:53:33 +00:00
Wolfgang Huß
31b1e2c13a
Merge pull request #5170 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/prettier-2.7.1 
Bump prettier from 2.2.1 to 2.7.1 in /webapp
 2022-08-27 16:49:41 +02:00