44 Commits

Author SHA1 Message Date
mattwr18
ba3e9e1025 Rename blacklist/whitelist to mute/unmute
- Follow @roschaefer suggestion in issue
- This can be reverted if we decide otherwise
2020-01-08 18:04:26 +01:00
mattwr18
c297b83f87 Convert block/unblock to blacklist/whitelist
- at the moment, we have implemented blocked like we want the
blacklist/whitelistUserContent to be, with the exception that is should
not be both ways. If I blacklist a user's content, they still see my
content in their news feed.
2020-01-07 18:57:35 +01:00
Wolfgang Huß
59f53a07c6 Clean up 2019-11-22 15:24:50 +01:00
Wolfgang Huß
ef84e9991f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation
# Conflicts:
#	backend/src/schema/index.js
2019-11-21 08:09:50 +01:00
Wolfgang Huß
cf02ca4506 Refactor decide mutation to new CaseFolder structure 2019-11-20 15:17:37 +01:00
mattwr18
feb65a6c9c Update property name to be more descriptive
- I wanted to trigger a build, since we had issues with our build server
today. I think this naming is more in the direction we want to go,
though. Maybe it could be makeShoutsPublic as @alina-beck used for the
translation keys... what do you think @kachulio
2019-11-12 21:19:52 +01:00
Joseph Ngugi
c8ce53d598 add allowShouts field 2019-10-31 21:21:31 +03:00
Wolfgang Huß
54be7782ba First refactoring tests to new database structure 2019-10-30 16:59:24 +01:00
Wolfgang Huß
6593c6ec5c Refactor the database structure from DISABLED to DECIDED relation
- First Step.
- Apply properties to the relation.
2019-10-25 16:51:47 +02:00
mattwr18
46fd534a28
Merge pull request #1840 from Human-Connection/1205-pinned-post-for-admins
Allow admins to pin a post
2019-10-21 14:37:14 +02:00
mattwr18
3163f6c9b1
Merge pull request #1853 from Human-Connection/219-add-createDate-follow-shout
Added createdAt date for follow and shout
2019-10-21 10:13:20 +02:00
mattwr18
ddf8b657be Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1205-pinned-post-for-admins 2019-10-18 15:17:03 +02:00
Alexander Friedland
abaa9b7759
locale
change language to locale
2019-10-18 12:14:11 +02:00
Kapil Jain
f6e70bee25 fix conflicts with merge 2019-10-17 15:17:54 -04:00
mattwr18
dd55d11739 Add backend test for PostOrdering 2019-10-17 17:56:16 +02:00
Kapil Jain
6b72772bbb Added tests for SHOUT and FOLLOW relationships to make sure they have "createdAt" date. 2019-10-16 22:47:02 -04:00
ogerly
dd2efad937 fix lint 2019-10-16 15:02:17 +02:00
ogerly
97dad41b27 Set language will be saved in the database of the user during registration 2019-10-16 15:01:07 +02:00
Kapil Jain
f73ff995e1 fixed lint errors 2019-10-14 15:17:49 -04:00
Kapil Jain
8a36ec6c29 added createdAt date for follow 2019-10-09 16:05:33 -04:00
Alexander Friedland
39b3d71be4
Merge branch 'master' into Allow_embedded_code_in_posts_permanent_memory 2019-10-07 10:35:04 +02:00
roschaefer
78bf076498 test: add tests for #1809 2019-10-04 01:39:18 +02:00
Alexander Friedland
deb21f6edb
Merge branch 'master' into Allow_embedded_code_in_posts_permanent_memory 2019-09-25 19:11:05 +02:00
ogerly
044e2bfed9 Allow embedded code in posts permanent in database 2019-09-23 20:08:45 +02:00
roschaefer
4fbabc879f Add tests for User validations 2019-09-20 20:16:18 +02:00
mattwr18
e89aff1272 Fix bug where about must not be empty string
- add test case to test this use case since it is the default from our
UI
2019-09-18 13:09:33 +02:00
ogerly
4b97131225 old stand 2019-09-12 16:37:30 +02:00
ogerly
948982682d fails, fails, fails 2019-09-04 10:09:20 +02:00
Alexander Friedland
e618ff005d
Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function 2019-09-04 06:42:40 +02:00
roschaefer
64268a1f3c Add locations to seeds, fix shoutedByCurrentUser 2019-09-03 21:28:29 +02:00
roschaefer
e5be418076 Refactor seeds - no need for a factories server!
Fix #1427
2019-09-03 21:28:29 +02:00
ogerly
1b9303ceaf Jest tests for the Terms and Conditions in frontend and backend 2019-09-03 09:46:18 +02:00
ogerly
36ce6361ec Alle Daten übernommen die für serverseitig rendern nötig sind 2019-08-23 11:02:24 +02:00
Robert Schäfer
bedbb21def Refactor notification spec
Wow this took me the entire day: If you run `createServer` multiple
times, more and more middlewares get added to the schema. That's why
the test would create 2^n notifications for n times you called
`createServer`. This is related to the following bug:

https://github.com/prisma/graphql-middleware/issues/63
2019-08-13 11:05:29 +02:00
Robert Schäfer
cc1f932803 Refactor tests with Post model 2019-08-13 11:05:29 +02:00
Robert Schäfer
05aee24efd Implement+test User.blockedUsers resolver 2019-08-13 11:05:29 +02:00
Robert Schäfer
b63f6b0ba1 Setup blocked relationships in seeds 2019-08-13 11:05:29 +02:00
Matt Rider
39a94a8aac Refactor
- follow PR review by @roschaefer
2019-08-07 14:55:32 +02:00
Robert Schäfer
26958f6641 Explicitly disallow User.name == null in model 2019-08-03 00:43:18 +02:00
Robert Schäfer
46589362fa Start to refactor User<->EmailAddress 2019-07-15 18:35:38 +02:00
Robert Schäfer
95a06a8344 Refactor all badges resolvers to use neode
FYI: @Tirokk I think we'll never remove or add new badges through
graphql. Instead, we will seed them manually with direct access to the
database. Therefore I removed the respective mutations and also your
tests regarding permissions.
2019-07-10 14:36:42 +02:00
Robert Schäfer
e4173a24aa Fix backend tests 2019-07-08 19:50:19 +02:00
Robert Schäfer
e77bf31470 User role must be set 2019-07-08 16:51:17 +02:00
Robert Schäfer
99b6254303 Split neode models into own directory 2019-07-08 16:45:39 +02:00