Alexander Friedland
|
a32a2d03be
|
Update webapp/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-09-09 11:30:48 +02:00 |
|
ogerly
|
109a5f5aa4
|
fix lint
|
2022-09-09 11:11:15 +02:00 |
|
ogerly
|
362aae3c5b
|
add router in group settings
|
2022-09-09 11:10:11 +02:00 |
|
ogerly
|
46f981357f
|
fix lint
|
2022-09-09 10:19:24 +02:00 |
|
ogerly
|
a9a2097557
|
Merge branch '5059-epic-groups' into 5140-My-Groups-Page
|
2022-09-09 10:14:46 +02:00 |
|
ogerly
|
e5a969b3f7
|
group settings add sidemenu
|
2022-09-08 17:05:16 +02:00 |
|
Wolfgang Huß
|
d87c0271a1
|
Merge pull request #5317 from Ocelot-Social-Community/5059-groups/5316-in-be-hidden-groups-not-listed-for-none-or-pending-members
feat: 🍰 Hidden Groups Shall Not Be Visible For None Or Pending Members In Backend
|
2022-09-08 15:42:18 +02:00 |
|
Wolfgang Huß
|
89920f387a
|
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups
# Conflicts:
# backend/src/schema/types/type/User.gql
|
2022-09-08 13:29:29 +02:00 |
|
Wolfgang Huß
|
6879b1112c
|
Refine tests of 'Group' resolver
|
2022-09-08 13:11:55 +02:00 |
|
Wolfgang Huß
|
00ccf5ed9a
|
Implement and test to find no hidden groups by 'Group' resolver where user is none or 'pending' member
|
2022-09-08 12:55:16 +02:00 |
|
ogerly
|
571e8fbddc
|
resolve conflicts 2
|
2022-09-08 12:20:28 +02:00 |
|
ogerly
|
f6de01e821
|
resolve conflicts
|
2022-09-08 12:11:50 +02:00 |
|
ogerly
|
fb9cf7559e
|
fix updateGroup function
|
2022-09-08 11:59:54 +02:00 |
|
Wolfgang Huß
|
0f9cc6864e
|
Merge pull request #5197 from Ocelot-Social-Community/5059-groups/5190-group-profile
feat: 🍰 Implement Group Profile
|
2022-09-08 10:59:51 +02:00 |
|
ogerly
|
fe6ad2cff3
|
add better seed for group myRole
|
2022-09-08 09:55:58 +02:00 |
|
Wolfgang Huß
|
dcf9a91ffc
|
Fix groups seeding
|
2022-09-08 09:06:18 +02:00 |
|
ogerly
|
99d2ce9d29
|
update group data funktion
|
2022-09-08 08:35:29 +02:00 |
|
Moriz Wahl
|
01dd0dc038
|
Merge pull request #5301 from Ocelot-Social-Community/fix-category-filter-menu
fix: Category Filter Menu Client Only
|
2022-09-07 12:57:45 +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
|
1c2a2a05fe
|
Merge pull request #5261 from Ocelot-Social-Community/save-category-settings
feat: Save Category Settings
|
2022-09-07 09:14:58 +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 |
|
Moriz Wahl
|
8a688ca78b
|
improve tests
|
2022-09-06 15:14:31 +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 |
|
ogerly
|
dbb8006432
|
Merge branch '5059-groups/5131-implement-update-group-resolver' into 5140-My-Groups-Page
|
2022-09-06 12:12:08 +02:00 |
|
ogerly
|
74b679c2c0
|
Merge branch '5059-groups/5131-implement-update-group-resolver' into 5140-My-Groups-Page
|
2022-09-06 12:08:46 +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 |
|
Moriz Wahl
|
4e5d4cb873
|
basic tests for save category settings
|
2022-09-05 20:51:48 +02:00 |
|
Moriz Wahl
|
fc6d544ea7
|
add resolver for save active categories
|
2022-09-05 20:07:14 +02:00 |
|
Moriz Wahl
|
572377acfd
|
add active categories to user
|
2022-09-05 20:06:10 +02:00 |
|
Moriz Wahl
|
b8ac4cc3ca
|
add saveCategoruSettings mutation to schema
|
2022-09-05 17:41:21 +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 |
|
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ß
|
b80a9fdff8
|
Merge pull request #5253 from Ocelot-Social-Community/5252-doc-graphql-playground
docs: 🍰 Document GraqhQL Playground
|
2022-09-01 15:06:19 +02:00 |
|