5716 Commits

Author SHA1 Message Date
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
ogerly
25a64a0c3c prework for group form 2022-08-07 21:37:19 +02:00
ogerly
f1831661e5 add my-groups page and setting link 2022-08-07 14:12:17 +02:00
Wolfgang Huß
504a9bcd49 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5131-implement-group-gql-model-and-crud 2022-08-04 09:28:45 +02:00
Wolfgang Huß
2107dd4be8 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5131-implement-group-gql-model-and-crud
# Conflicts:
#	backend/.env.template
#	webapp/.env.template
2022-08-03 15:56:10 +02:00
Wolfgang Huß
e758e1337d Release v1.1.0 - implement categories again 2022-08-03 15:24:42 +02:00
ogerly
fd36da604f Merge branch 'make-categories-optional' into 5140-My-Groups-Page 2022-08-03 10:38:01 +02:00
ogerly
cf31f3c1d6 preparation for creating a new group 2022-08-03 10:26:08 +02:00
Wolfgang Huß
a8a6acb9f7 Rename 'UserGroup' to 'UserRole' 2022-08-03 08:14:05 +02:00
Wolfgang Huß
f565e5fb6a Implement 'CreateGroup' with tests 2022-08-02 16:20:11 +02:00
Wolfgang Huß
b42424431f Fix locales 2022-08-02 08:54:46 +02:00
Wolfgang Huß
4075e63167 Fix linting 2022-08-02 08:54:33 +02:00
Wolfgang Huß
d39213f559 Refactor MySomethingList and social media list and adding deletion modal dialog 2022-08-02 08:52:13 +02:00
Wolfgang Huß
33026ba3e0 Add explaining comments to confirmation modal 2022-08-02 08:30:54 +02:00
Moriz Wahl
938f5ccdf9 fix all tests 2022-07-25 23:20:05 +02:00
Moriz Wahl
b71b20ae81 fix more tests 2022-07-25 23:04:12 +02:00
Moriz Wahl
5393c2aeaa fix some tests 2022-07-25 22:53:19 +02:00
Moriz Wahl
bc955003f7 add optional categories to teaser and post 2022-07-25 20:03:00 +02:00
Moriz Wahl
e31f250ea5 env vatiable for CATEGORIES_ACTIVE and switch for categories in contribution form 2022-07-25 18:41:39 +02:00
Wolfgang Huß
6247734a32 Release v1.0.9 2022-07-20 14:42:38 +02:00
ogerly
e2f0138543 change footer version-link 2022-07-19 15:30:18 +02:00
ogerly
c4d9e028d7 add RU locales, set text in plural 2022-07-19 12:26:01 +02:00
ogerly
f4a746aa38 add all locales, set text in plural 2022-07-19 12:14:30 +02:00
ogerly
7ad398fb20 refactor search info text 2022-07-19 11:50:59 +02:00
Wolfgang Huß
9143eb7143 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5072-remove-image-entries-in-docker-compose-files-fix-m1
# Conflicts:
#	DOCKER_MORE_CLOSELY.md
#	docker-compose.override.yml
#	docker-compose.test.yml
#	docker-compose.yml
2022-07-18 19:01:58 +02:00