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

5716 Commits

Author SHA1 Message Date
ogerly
99d2ce9d29 update group data funktion 2022-09-08 08:35:29 +02:00
Moriz Wahl
754251258d test setting of saved categories 2022-09-07 21:50:37 +02:00
Moriz Wahl
b323d0f580 set category filter as stored in db after login 2022-09-07 20:19:10 +02:00
Moriz Wahl
32e7c8971c Merge branch 'master' into save-categories-in-frontend 2022-09-07 15:14:03 +02:00
Moriz Wahl
5596cd11e9 test saving active categories 2022-09-07 15:13:14 +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
Wolfgang Huß
99b1a164a8 Remove testing of group profile for now 2022-09-07 12:29:17 +02:00
Wolfgang Huß
ee770aa204 Cleanup 2022-09-07 12:25:08 +02:00
Wolfgang Huß
fa79c25e9b Implement join button on Group profile, a start 2022-09-07 11:12:34 +02:00
Moriz Wahl
f5d8014f6c fix: Category Filter Menu Client Only 2022-09-07 11:06:43 +02:00
Moriz Wahl
3213bd3ee4 test save categories 2022-09-06 19:17:06 +02:00
Moriz Wahl
dcdef615c1 add locales for saving categories 2022-09-06 18:51:55 +02:00
Moriz Wahl
d45ad17b43 add save button to category filters 2022-09-06 18:51:20 +02:00
Moriz Wahl
d4c338e04e add save categories mutation 2022-09-06 18:50:33 +02:00
Moriz Wahl
523d290ff8 add save icon 2022-09-06 18:50:05 +02:00
Moriz Wahl
60fabe587b
Merge pull request #5248 from Ocelot-Social-Community/create-topics-menu 
feat: Topics Menu
 2022-09-06 13:28:15 +02:00
ogerly
228a676cd5 fix locales 2022-09-06 12:20:25 +02:00
Wolfgang Huß
9b83b37ea3 Upload group avatar on group profile page 2022-09-06 09:14:28 +02:00
ogerly
5f7b1c9094 new group mutation with correct data 2022-09-05 13:26:00 +02:00
ogerly
9715243454 Merge branch '5059-epic-groups' into 5140-My-Groups-Page 2022-09-05 11:18:57 +02:00
ogerly
bfe6605b21 list upgrade database datas 2022-09-05 11:17:31 +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
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ß
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ß
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ß
b9e59badb0 Add avatar to group page 2022-08-30 06:27:37 +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ß
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ß
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ß
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
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ß
d8d080dae5 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into categories-filter-menu 2022-08-25 17:39:38 +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
Moriz Wahl
407f4f8d2d fix test (mock .CATEGORIES_ACTIVE) 2022-08-25 13:29:08 +02:00
Wolfgang Huß
d112538e63
Merge pull request #5174 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/vue-sweetalert-icons-4.3.1 
Bump vue-sweetalert-icons from 4.3.0 to 4.3.1 in /webapp
 2022-08-25 13:29:02 +02:00