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

877 Commits

Author SHA1 Message Date
Wolfgang Huß
0f8abe770a Move GQL mutation 'loginMutation' in 'user_management.spec.js' into a separate file 2022-08-15 15:02:04 +02:00
Moriz Wahl
beacad4a17 set CONFIG in specs 2022-08-15 11:07:45 +02:00
Moriz Wahl
dd876c52fa increas max-old-space-size for jest, handle some asyncs, test validation for caregories only if categories are active 2022-08-15 10:52:31 +02:00
Wolfgang Huß
b0d28f8649 Rename 'descriptionAddition100' to 'descriptionAdditional100' 2022-08-10 13:19:42 +02:00
Wolfgang Huß
5e741ead8d Overtake Moriz suggestions 2022-08-10 13:15:43 +02:00
Wolfgang Huß
f150ea3d7c
Update backend/src/schema/resolvers/groups.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-10 12:52:31 +02:00
Wolfgang Huß
82401b1488
Update backend/src/schema/resolvers/groups.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-10 12:52:20 +02:00
Wolfgang Huß
3d1b403656 Add relation 'CREATED' between owner and group 2022-08-09 16:55:43 +02:00
Wolfgang Huß
0149af12d4 Cleanup 2022-08-09 16:50:28 +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
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
Wolfgang Huß
61344fc96b Implement errors for to less or to many categories and test it 2022-08-09 08:50:25 +02:00
Wolfgang Huß
7847d6912c Return 'categories' in the 'Group' GQL query 2022-08-09 08:21:26 +02:00
Wolfgang Huß
fcca0f378d Implement 'Group' query, next step 2022-08-04 09:24:04 +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ß
867b78dfa3 Implement 'Group' query, second step 2022-08-03 15:16:23 +02:00
Wolfgang Huß
94411648fd Implement 'Group' query, first step 2022-08-03 13:29:49 +02:00
Wolfgang Huß
cc44ee8ebc Refactor relations ':OWNS' and ':ADMINISTERS' to ':MEMBER_OF' with properties 2022-08-03 13:12:50 +02:00
Wolfgang Huß
520598c897 Implement 'description', 'groupType', and 'actionRadius' in 'CreateGroup' 2022-08-03 11:50:56 +02:00
Wolfgang Huß
a8a6acb9f7 Rename 'UserGroup' to 'UserRole' 2022-08-03 08:14:05 +02:00
Wolfgang Huß
ea0223b6f2 Rename 'UserGroup' to 'UserRole' 2022-08-03 07:59:00 +02:00
Wolfgang Huß
fc20143a65 Test groups creation in slugifyMiddleware 2022-08-03 07:51:29 +02:00
Wolfgang Huß
f565e5fb6a Implement 'CreateGroup' with tests 2022-08-02 16:20:11 +02:00
Wolfgang Huß
bf9dd205ca Implement GQL for groups 2022-08-02 08:26:14 +02:00
Moriz Wahl
1b2509229c remove bad line in cypher 2022-07-25 19:22:17 +02:00
Moriz Wahl
28ddfde0e3 add categories active to .env, save categories on create 2022-07-25 19:02:08 +02:00
Wolfgang Huß
5abbf22b43 Implement 'inviteCode' and 'nonce' lengths via 'registration.js' in backend and webapp 2022-06-23 17:44:59 +02:00
Wolfgang Huß
3adfab34c5 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4785-test-refactor-email-templates 2022-06-22 14:26:29 +02:00
Wolfgang Huß
aea15229b9 Fix location backend test 2022-06-22 13:32:55 +02:00
Wolfgang Huß
8648c271a7 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4785-test-refactor-email-templates 2022-05-04 09:31:04 +02:00
Wolfgang Huß
0867d2bfca Fix backend test of locations 2022-05-03 13:43:10 +02:00
Wolfgang Huß
ce5161f937 Test e-mail templates, remain files, first step 2021-11-18 08:53:31 +01:00
Wolfgang Huß
5bf755f4eb Fix backend test 'src/schema/resolvers/users/location.spec.js' 2021-10-25 20:15:53 +02:00
Wolfgang Huß
49e4111def Fix to set 'sendNotificationEmails' on admin of db init 
- Set other missing properties on admin of db init.
- Additionally set default donations `progress` value to `7000` to have a better looking design on the news feed for devs and testers.
- Fix test in `pages/admin/donations.spec.js`.
 2021-09-29 10:32:51 +02:00
Wolfgang Huß
7ae5593f82 Implement user notifications settings 2021-09-22 14:05:10 +02:00
Wolfgang Huß
af8b7ba367 Fix backend test 2021-09-16 13:59:58 +02:00
Wolfgang Huß
850f3c15ac Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4265-move-sort-newsfeed-menu-into-filter-menu 
# Conflicts:
#	webapp/components/DonationInfo/DonationInfo.spec.js
#	webapp/components/DonationInfo/DonationInfo.vue
#	webapp/pages/index.vue
 2021-09-16 11:30:05 +02:00
Wolfgang Huß
62de9a158e Fix as quick fix for all reminding tests 2021-07-26 11:36:42 +02:00
Wolfgang Huß
629a8da241 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4265-move-sort-newsfeed-menu-into-filter-menu 
# Conflicts:
#	backend/src/schema/resolvers/donations.spec.js
 2021-07-21 11:22:34 +02:00
Wolfgang Huß
7620d9b4da Fix linting to this new prettier 2021-07-20 18:30:43 +02:00
Wolfgang Huß
af5e255aad Fix several problems with admins setting of donations info 
- Use 'toString' to care for setting the values of the donation progress bar.
 2021-06-15 13:55:08 +02:00
Wolfgang Huß
da951c6fb6 Clean up 2021-05-06 16:37:31 +02:00
Wolfgang Huß
59dfb4662e Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4265-move-sort-newsfeed-menu-into-filter-menu 2021-05-06 16:04:09 +02:00
Wolfgang Huß
548df0a753 Fix tests 2021-05-06 16:02:42 +02:00
Wolfgang Huß
d40dd94868 Implement showDonations in the database 
- Add to backend tests.
 2021-04-15 10:51:01 +02:00
Ulf Gebhardt
cba299827d
lint fixes backend 2021-04-12 13:24:52 +02:00
Ulf Gebhardt
99e75066f9
fixed backend unit tests 2021-04-12 13:24:52 +02:00
Ulf Gebhardt
d29cff193c
Notification.Mention.feature 
Regex for URL matches "I am on page ..."
Fixed some category/search related errors
 2021-04-12 13:24:51 +02:00
Moriz Wahl
c80b3a2128 slider jumps to enter-nonce when link contains invite-code, email and nonce and method is invite-code. Thanks @tirokk 2021-04-06 13:35:31 +02:00