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
Moriz Wahl
87aa47d683 add optional topica menu when categories are active 2022-08-31 14:32:46 +02:00
Moriz Wahl
d6f8b0dc77 change category to topic in german and english locales 2022-08-31 14:28:25 +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
Wolfgang Huß
1252e79be2 Fix test description from 'enter-nonce' to 'change-password' 2022-08-27 16:42:11 +02:00
Wolfgang Huß
e82d35c824 Fix linting 2022-08-25 23:17:50 +02:00
Wolfgang Huß
512784e580 Fix group tests 2022-08-25 20:17:23 +02:00
dependabot[bot]
0a02e1e402
Bump prettier from 2.2.1 to 2.7.1 in /webapp 
Bumps [prettier](https://github.com/prettier/prettier) from 2.2.1 to 2.7.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.2.1...2.7.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-25 18:15:25 +00:00
Wolfgang Huß
3f94fe189b
Merge pull request #5211 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/eslint-plugin-prettier-3.4.1 
Bump eslint-plugin-prettier from 3.1.2 to 3.4.1 in /backend
 2022-08-25 20:11:30 +02:00
Wolfgang Huß
7f64c36d4c Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/backend/eslint-plugin-prettier-3.4.1 2022-08-25 18:41:00 +02:00
Wolfgang Huß
f2aba3e12e Put exclamation mark behind console log text of successfully created default admin user for consistency 2022-08-25 18:03:21 +02:00
Wolfgang Huß
d8d080dae5 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into categories-filter-menu 2022-08-25 17:39:38 +02:00
dependabot[bot]
eef8d60046
Bump eslint-plugin-prettier from 3.1.2 to 3.4.1 in /backend 
Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.1.2 to 3.4.1.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/commits)

---
updated-dependencies:
- dependency-name: eslint-plugin-prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-25 15:37:22 +00:00
Wolfgang Huß
1069c3b910
Merge pull request #5193 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/slug-6.0.0 
Bump slug from 4.0.2 to 6.0.0 in /backend
 2022-08-25 17:35:21 +02:00
Tima Gixe
88c10a03e1
Merge pull request #5208 from Ocelot-Social-Community/5207-fix-typo-in-pull-request-template 
chore: 🍰 Fix typo in PULL_REQUEST_TEMPLATE.md file
 2022-08-25 15:37:56 +03:00
Wolfgang Huß
894c25c165 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5188-query-members-of-group 2022-08-25 13:54:06 +02:00
Wolfgang Huß
48ff8610de Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-08-25 13:53:24 +02:00
Wolfgang Huß
921adb9d8b Fixed all tests 2022-08-25 13:47:37 +02:00
Wolfgang Huß
c3ab014d9c Set 'updatedAt' to 'null' on 'MEMBER_OF' creation in all group resolvers 2022-08-25 13:44:05 +02:00