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

5490 Commits

Author SHA1 Message Date
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
Wolfgang Huß
ab3ab3b07d Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/vue-sweetalert-icons-4.3.1 2022-08-25 11:57:35 +02:00
Tima Gixe
15ce070288 Update tests to expect Not Authorized! 2022-08-25 09:08:14 +03:00
Wolfgang Huß
e1f4609c25 !!! Temp !!! 2022-08-23 04:48:38 +02:00
Moriz Wahl
ad4497786c add missing items for categories 2022-08-22 20:29:04 +02:00
Moriz Wahl
25c8fe275f add locales for yunite categories 2022-08-22 20:11:21 +02:00
Moriz Wahl
eddaa96d36 add movement icon 2022-08-22 18:52:42 +02:00
Moriz Wahl
a22023174d feat: Show Categories Filter when Categories are Active 2022-08-22 18:33:12 +02:00
Wolfgang Huß
91d797dcfa Copy profile Vue pages for the group profile 2022-08-22 12:14:54 +02:00
dependabot[bot]
73559242d6
Bump cross-env from 7.0.2 to 7.0.3 in /webapp 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 7.0.2 to 7.0.3.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v7.0.2...v7.0.3)

---
updated-dependencies:
- dependency-name: cross-env
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-16 06:44:19 +00:00
ogerly
936ecf2477 add mutation createGroup and query GroupList 2022-08-15 15:35:33 +02:00
ogerly
267534e95b Merge branch '5059-groups/5131-implement-group-gql-model-and-crud' into 5140-My-Groups-Page 2022-08-15 09:43:39 +02:00
ogerly
c2a769f325 add CategoriesSelect in GroupForm.vue 2022-08-14 12:49:15 +02:00
ogerly
46d26a0ef8 add graphql groups, add createGroup mutation 2022-08-14 11:45:33 +02:00
ogerly
addfc39c4c add groupe site id und slug 2022-08-11 11:10:52 +02:00
dependabot[bot]
d2f6590e05
Bump vue-sweetalert-icons from 4.3.0 to 4.3.1 in /webapp 
Bumps [vue-sweetalert-icons](https://github.com/JorgenVatle/vue-sweetalert-icons) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/JorgenVatle/vue-sweetalert-icons/releases)
- [Commits](https://github.com/JorgenVatle/vue-sweetalert-icons/compare/v4.3.0...v4.3.1)

---
updated-dependencies:
- dependency-name: vue-sweetalert-icons
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-11 04:25:39 +00:00
ogerly
afb5c719dc add color from yunite in branding 2022-08-10 09:52:59 +02:00
ogerly
d50ae27e49 prework for group list 2022-08-10 09:07:32 +02:00
ogerly
85fd02a30f remove grey from sccs branding 2022-08-10 08:05:54 +02:00
Wolfgang Huß
117bd5e4e6 Implement error for to short 'description' and test it 2022-08-09 16:34:50 +02:00
Wolfgang Huß
b5678f7c61 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5131-implement-group-gql-model-and-crud 
# Conflicts:
#	backend/src/schema/types/type/User.gql
 2022-08-09 14:50:11 +02:00
ogerly
3c11d1f468 fix lint 2022-08-09 13:27:24 +02:00
ogerly
968dcc7276 add yunite logo and branding scss file 2022-08-09 13:24:31 +02:00
ogerly
336e9469db add optional header menu 2022-08-09 11:55:00 +02:00
ogerly
60302c08d7 add optional header menu 2022-08-09 11:52:28 +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
ogerly
fbf1ced7ba Merge branch '5059-groups/5131-implement-group-gql-model-and-crud' into 5140-My-Groups-Page 2022-08-08 08:24:59 +02:00