ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-04-06 01:25:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,240 Commits 135 Branches 1,855 Tags
Commit Graph

458 Commits

Author SHA1 Message Date
mattwr18
e6fdb70a07 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-27 18:09:24 +01:00
mattwr18
d18d9228b0 Refactor tests/resolvers 
- we were making multiple http requests to report resources in this
test, now we are bypassing these requests by setting the database up to
how we want to test, then testing what we want in isolation.
- also added tests for closing a report
- favor union for returning resource
- simplify review mutation
 2019-11-27 17:35:30 +01:00
mattwr18
3a05844356 Refactor tests/resolvers 
- Favor union as it's cleaner and less code
- refactor tests to new implementation
- add reviewedByModerator resolver
 2019-11-27 17:31:51 +01:00
mattwr18
d03d669056 Remove reviewedByModerator from resources 
- moved to Report node, as the report was reviewed by the moderator...
a resource can have many reports on them, so we are interested in
grouping reviewed/filed by report
 2019-11-27 17:26:42 +01:00
mattwr18
62080a0afb
Merge pull request #2295 from Human-Connection/2294_fix_email_filter 
If an admin searches for a user by email, don't crash if no user can be found
 2019-11-27 14:46:16 +01:00
mattwr18
eceeecd9b7 Refactor reports query, tests 
- Query returns an array of Reports with all the filedReports that
belong to them
- Mutation returns the same
 2019-11-26 21:34:21 +01:00
mattwr18
2f249a73c5 Rename REPORTED Claim to FILED Report 2019-11-26 15:35:48 +01:00
mattwr18
20d693b921 Add tests for Claim, refactor tests 2019-11-25 19:00:58 +01:00
mattwr18
38c5b9e4ec Refactor reports resolver, REPORTED type 
- return Claim instead of setting more properties on relationship
REPORTED
- use readTransaction for query to benefit from autmatic retries, follow
neo4j suggestion
- use map instead of forEach https://codeburst.io/javascript-map-vs-foreach-f38111822c0f
 2019-11-25 18:56:58 +01:00
Wolfgang Huß
67a5a00704 Clean up 2019-11-23 10:58:16 +01:00
Wolfgang Huß
6890ef25be Add sorting to resource claims and reports lists 2019-11-23 10:34:55 +01:00
Wolfgang Huß
70d8830e4c Add comment to Cypher of report mutation 2019-11-23 09:32:29 +01:00
Wolfgang Huß
0b7a0496a2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 
# Conflicts:
#	webapp/locales/de.json
 2019-11-23 08:07:53 +01:00
Wolfgang Huß
99af6cbf8a Implement displaying multiple claims in the frontend 2019-11-22 18:40:51 +01:00
Wolfgang Huß
0de778e743 Correct mutations report and review to overtake the resource disabled 2019-11-22 16:14:45 +01:00
Wolfgang Huß
7de34d3d55 Fix tests by first report before review 2019-11-22 15:56:21 +01:00
Wolfgang Huß
59f53a07c6 Clean up 2019-11-22 15:24:50 +01:00
roschaefer
ae360f2201 fix #2329: Normalize email on login in the backend 2019-11-22 15:24:27 +01:00
Wolfgang Huß
ec8910d6eb Rename decide mutation to review 2019-11-22 15:12:00 +01:00
Wolfgang Huß
02bdc5ea5d Rename node CaseFolder to Claim and relation FLAGGED to BELONGS_TO 2019-11-22 12:18:43 +01:00
Wolfgang Huß
a7aaee98c1 No new review if a reviewer changes their opinion 2019-11-22 10:39:55 +01:00
Wolfgang Huß
a5689e2f67 Get implementing 'reviewedByModerator' further 2019-11-22 08:44:40 +01:00
Wolfgang Huß
c0fb53c2b5 Get frontend running by start implementing 'reviewedByModerator' right 2019-11-21 13:35:12 +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ß
6d9e6e7f0a Get frontend runnig with new CaseFolder structure first try 2019-11-20 16:22:36 +01:00
Wolfgang Huß
0fdd46b656 Implement CaseFolder property rule 2019-11-20 15:30:37 +01:00
Wolfgang Huß
cf02ca4506 Refactor decide mutation to new CaseFolder structure 2019-11-20 15:17:37 +01:00
Wolfgang Huß
7c3ec289f7 Start refactor the decide mutation to CaseFolder structure 2019-11-20 08:33:47 +01:00
roschaefer
b0d20ede71 Fix #2294 
Ideally we would not have this inconsistent edge case that we filter
through the user type. Much better would be a graphql query like:

```graphql
{
  User(filter: { primary_email: { email: "something@example.org" } }) {
    id
    name
    slug
  }
}
```
 2019-11-19 21:24:58 +01:00
Robert Schäfer
9a985d464c
Merge pull request #2257 from Human-Connection/bump_metascraper_modules 
build(deps): bump metascraper modules
 2019-11-18 22:00:26 +01:00
mattwr18
19d2e2cd41
Merge pull request #2243 from Human-Connection/refactor_neo4j-graphql-js 
Explicitly define our schema, improve performance
 2019-11-18 21:46:56 +01:00
Robert Schäfer
735a31ed00
Merge pull request #2101 from Human-Connection/1747-show-shouts 
1747 show shouts
 2019-11-18 17:00:43 +01:00
Wolfgang Huß
3b4de22855 Refactor reports mutation to CaseFolder structure 2019-11-18 11:25:47 +01:00
Wolfgang Huß
240bd84b45 Refactor report mutation 2019-11-18 10:36:49 +01:00
Wolfgang Huß
4a732beb0a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-18 07:59:44 +01:00
Wolfgang Huß
b569f46dad Refactor report mutation beginn 2019-11-18 07:57:52 +01:00
roschaefer
5d570c24a7 Fix tests 2019-11-16 20:21:27 +01:00
roschaefer
978347ba7b Tell github-linguists to ignore snapshots 2019-11-16 20:09:05 +01:00
roschaefer
034a353367 Hard-code graphql schema 
Apparently, `neo4j-graphql-js` *replaces* the schema partly. When we use
join models like `EMOTED`, `neo4j-graphql-js` puts in a join model with
the two names of the connected types.
 2019-11-15 11:04:07 +01:00
Wolfgang Huß
d2442b73c9 Refactor report mutation 2019-11-15 10:49:55 +01:00
roschaefer
c6e4c38de8 build(deps): remove deprecated debug flags 
I deprecated the debug flags myself here:
https://github.com/neo4j-graphql/neo4j-graphql-js/pull/288

You can now debug the queries run by `neo4j-graphql-js` by starting
the backend like this:

```bash
DEBUG=neo4j-graphql-js yarn run backend
```
 2019-11-14 14:22:20 +01:00
Wolfgang Huß
913fcc2cdb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 
# Conflicts:
#	backend/src/schema/index.js
#	webapp/locales/pt.json
 2019-11-14 09:41:00 +01:00
Alina Beck
6213a25355
Merge branch 'master' into 1747-show-shouts 2019-11-14 09:37:54 +03:00
mattwr18
b38fde0fd0 Fix production error "User.locale" returned undefined 2019-11-13 18:00:35 +01:00
mattwr18
a0fe9cb94c
Merge pull request #2218 from Human-Connection/fix_locations_resolver 
fix: return `null` for missig translations
 2019-11-12 22:38:59 +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
mattwr18
ecf0e5948b Commit to trigger build 
- prefer variables on one line
 2019-11-12 21:09:02 +01:00
roschaefer
deb4b4f698 fix: return null for missig translations 
A query such as `{ notifications }` would return `null` for Locations
with a missing translation, e.g. `nameRU`. This would not happen for
queries implemented by `neo4j-graphql-js` because they nullify all
missing attributes automatically.
 2019-11-12 19:14:34 +01:00
Alina Beck
6e3bd19267 set up privacy page in settings 2019-11-12 19:13:56 +03:00
mattwr18
3b5e40efaa Merge branch 'master' of github.com:Human-Connection/Human-Connection into donation-info 2019-11-12 15:18:10 +01:00