298 Commits

Author SHA1 Message Date
Robert Schäfer
57fc99fc3f Fix merge error again
cc @Lulaby pay attention when merging `master`
2019-03-13 17:01:49 +01:00
Lala Sabathil
12fc42973a
Merge branch 'master' into 212-change-password 2019-03-13 16:50:19 +01:00
Robert Schäfer
e9e0c84cb2 Fixed merge error
CC @Lulalaby
2019-03-13 16:48:56 +01:00
Wolfgang Huß
460f94ea3f Add unauthenticated test to follow and shout
close #234
2019-03-13 14:32:15 +01:00
Wolfgang Huß
a6f96cad78 Merge branch 'master' of https://github.com/Human-Connection/Nitro-Backend 2019-03-12 18:45:49 +01:00
Wolfgang Huß
22b521b93d Deleted a line in graphql.schema 2019-03-11 17:02:31 +01:00
Lala Sabathil
628502de05
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-11 14:37:02 +01:00
Lala Sabathil
2b6f7270b5
Merge branch 'master' into 212-change-password 2019-03-11 02:19:02 +01:00
Grzegorz Leoniec
2116936062 Fixed shout and follow seeding 2019-03-10 19:05:50 +01:00
Robert Schäfer
60d711bb0a Prevent to report any type
Resouce must have a label (Post|Comment|User)
2019-03-10 19:05:50 +01:00
Robert Schäfer
ee5c4127e6 Prevent disabling any type
Resource must have a label Post|Comment|User
2019-03-10 19:05:50 +01:00
Robert Schäfer
f14c903d2a Refactor: we don't need a setup object 2019-03-10 19:05:50 +01:00
Robert Schäfer
cae3330105 Fix deprecation: async function passed to describe 2019-03-10 19:05:50 +01:00
Grzegorz Leoniec
e82cf9b349
Merge branch 'master' into get_rid_of_resource_type 2019-03-10 17:22:22 +01:00
kachulio1
0a31e5278c add test for correct credentials 2019-03-10 01:44:41 +03:00
kachulio1
6cba9f1fd8 remove image url 2019-03-10 00:50:16 +03:00
kachulio1
3fbe4cb2e6 add use single quotes 2019-03-10 00:48:16 +03:00
kachulio1
35339b4674 add changePassword mutation test 2019-03-09 14:50:23 +03:00
kachulio1
82ae81d8fe add changePasssword mutation 2019-03-09 14:50:23 +03:00
Robert Schäfer
261edef72b Remove duplicate mutations 2019-03-08 20:55:46 +01:00
Grzegorz Leoniec
11a539d63e
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-08 18:39:40 +01:00
Grzegorz Leoniec
9260705611
Fixed shout seeding 2019-03-08 17:03:59 +01:00
Grzegorz Leoniec
f86fc7507c
Fixed shout and follow seeding 2019-03-08 16:49:43 +01:00
Lala Sabathil
8c4c7709b5
Merge branch 'master' into get_rid_of_resource_type 2019-03-08 15:44:51 +01:00
mattwr18
6d2d4f305f
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-07 21:08:20 -03:00
Lala Sabathil
c50c4b78d9
Merge branch 'master' into distinct-shouts-and-follows 2019-03-08 01:00:19 +01:00
Robert Schäfer
f68e289016 Fix lint 2019-03-07 22:44:43 +01:00
Robert Schäfer
0529e2b2b0 Refactor report mutation, return a proper Report 2019-03-07 22:42:32 +01:00
Matt Rider
61a45d39ea Respond with reporter, resource 2019-03-07 17:43:00 -03:00
Robert Schäfer
95e9c14cc6 Refactor report mutation/type to reduce redundancy
We don't need to save the type of the reported resource. We can derive
it.
2019-03-07 20:13:39 +01:00
Robert Schäfer
4596041186 Refactor mutations without Resource type 2019-03-07 20:13:25 +01:00
Robert Schäfer
1377455cda Disable/enable should return the Resource 2019-03-07 18:31:54 +01:00
Grzegorz Leoniec
fcb51e4eda
Merge remote-tracking branch 'origin/master' into 37-full-text-search-top-bar 2019-03-06 18:49:34 +01:00
Robert Schäfer
389f447186
Merge branch 'master' into 27_disable_posts 2019-03-06 17:21:56 +01:00
Robert Schäfer
8072939458 Tiny performance improvement 2019-03-06 17:21:49 +01:00
Robert Schäfer
f40a67b7a8 Implement disabling of comments+users+posts 2019-03-06 17:13:36 +01:00
Robert Schäfer
1c34f10f96 Test refactoring: Check comments + posts 2019-03-06 17:13:36 +01:00
Grzegorz Leoniec
7a00e7f1c7
Merge remote-tracking branch 'origin/master' into distinct-shouts-and-follows 2019-03-06 13:23:04 +01:00
Grzegorz Leoniec
2813de4f8b
Fixed organization seeder 2019-03-06 13:20:33 +01:00
Robert Schäfer
5cff508bd6 Disable/enable fullfills tests 2019-03-06 01:07:04 +01:00
Robert Schäfer
0a73ddd46d Refactor: custom resolvers for moderation 2019-03-05 23:59:54 +01:00
Grzegorz Leoniec
865fdebc5f
Fixed linting issues inside tests 2019-03-05 18:58:17 +01:00
Grzegorz Leoniec
c2aea104f4
Added basic tests for follow mutation 2019-03-05 18:44:39 +01:00
Grzegorz Leoniec
4fdb1562f9
Added test for shoutedByCurrentUser flag on posts 2019-03-05 18:34:35 +01:00
Grzegorz Leoniec
a292a522e9
Fixed an issue and added basic testing for (un)shout 2019-03-05 18:30:28 +01:00
Robert Schäfer
2b7576521c Fix lint
+ return more attributes in post factory for convenience
2019-03-05 18:17:02 +01:00
Robert Schäfer
592f25b978 Implement update of .disabled field 2019-03-05 18:14:25 +01:00
Robert Schäfer
99cebc8d64 Implementation ready except disabled attr. 2019-03-05 17:45:10 +01:00
Robert Schäfer
f2e7e515a4 Check from: User! matches the authenticated user 2019-03-05 16:46:39 +01:00
Robert Schäfer
85d9d7043e Setup isModerator permission for disable relation 2019-03-05 16:25:01 +01:00