IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,654 Commits 5 Branches 2 Tags
Commit Graph

2026 Commits

Author SHA1 Message Date
roschaefer
7146e0a9b2 Fix lint 2019-11-28 13:48:09 +01:00
mattwr18
21be2c08ba Update to return resource instead of to 
- more verbose makes it easier to understand
 2019-11-28 13:44:00 +01:00
mattwr18
595236ac53
Merge pull request #2372 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-7.0.4 
build(deps): bump graphql-shield from 7.0.2 to 7.0.4 in /backend
 2019-11-28 11:46:49 +01:00
dependabot-preview[bot]
a1a68a36ce
build(deps-dev): bump @babel/cli from 7.7.0 to 7.7.4 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.7.0 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.0...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-28 10:40:27 +00:00
mattwr18
fc31aae181
Merge pull request #2359 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.7.4 
build(deps-dev): bump @babel/core from 7.7.2 to 7.7.4 in /backend
 2019-11-28 11:38:26 +01:00
roschaefer
9e2baf25d2 Don't remove dots in emails 2019-11-28 11:22:09 +01:00
dependabot-preview[bot]
98623133fe
build(deps): bump graphql-shield from 7.0.2 to 7.0.4 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.2 to 7.0.4.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.2...v7.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-28 04:18:22 +00:00
Alina Beck
dda9837569 set aspect ratio for seed data to actual ratio of faker images 2019-11-27 21:34:23 +03:00
dependabot-preview[bot]
3c4a3a8a32
build(deps): bump apollo-server from 2.9.11 to 2.9.12 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.11 to 2.9.12.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.9.11...apollo-server@2.9.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 17:17:58 +00:00
dependabot-preview[bot]
1f52c73324
build(deps-dev): bump @babel/core from 7.7.2 to 7.7.4 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.2 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.2...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 17:16:21 +00:00
mattwr18
ff1ba9ea21
Merge pull request #2368 from Human-Connection/dependabot/npm_and_yarn/backend/hapi/joi-16.1.8 
build(deps): bump @hapi/joi from 16.1.7 to 16.1.8 in /backend
 2019-11-27 18:15:31 +01:00
mattwr18
943693f9ed
Merge pull request #2365 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-23.0.5 
build(deps-dev): bump eslint-plugin-jest from 23.0.4 to 23.0.5 in /backend
 2019-11-27 18:15:11 +01:00
mattwr18
46c16e9060
Merge pull request #2339 from Human-Connection/dependabot/npm_and_yarn/backend/babel/plugin-proposal-throw-expressions-7.7.4 
build(deps-dev): bump @babel/plugin-proposal-throw-expressions from 7.2.0 to 7.7.4 in /backend
 2019-11-27 18:14:15 +01:00
mattwr18
6865709210
Merge pull request #2334 from Human-Connection/refactor_is_author_permission 
refactor: Close session in isAuthor permission
 2019-11-27 18:13:48 +01:00
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
6324fd7d26 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2253-fix-scroll-layout-issue 2019-11-27 18:05:02 +01:00
mattwr18
c6f16497fa Update Post slug to be non-nullable 2019-11-27 17:45:05 +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
2332576e17 Add imageAspectRatio to seeded Post 2019-11-27 12:08:21 +01:00
dependabot-preview[bot]
6798d18b92
build(deps): bump @hapi/joi from 16.1.7 to 16.1.8 in /backend 
Bumps [@hapi/joi](https://github.com/hapijs/joi) from 16.1.7 to 16.1.8.
- [Release notes](https://github.com/hapijs/joi/releases)
- [Changelog](https://github.com/hapijs/joi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hapijs/joi/compare/v16.1.7...v16.1.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 04:22:51 +00:00
dependabot-preview[bot]
ef17b40678
build(deps-dev): bump eslint-plugin-jest in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.4 to 23.0.5.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.0.4...v23.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 04:21:28 +00: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
0a72627230
Merge pull request #2358 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-6.7.1 
build(deps-dev): bump eslint from 6.6.0 to 6.7.1 in /backend
 2019-11-26 10:21:55 +01:00
dependabot-preview[bot]
dcc14acf7c
build(deps-dev): bump @babel/plugin-proposal-throw-expressions 
Bumps [@babel/plugin-proposal-throw-expressions](https://github.com/babel/babel) from 7.2.0 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.2.0...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-26 09:21:17 +00:00
mattwr18
f74866fd02
Merge pull request #2341 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.7.4 
build(deps-dev): bump @babel/preset-env from 7.7.1 to 7.7.4 in /backend
 2019-11-26 10:19:11 +01:00
mattwr18
1dca68679e
Merge pull request #2322 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.8.1 
build(deps): bump date-fns from 2.7.0 to 2.8.1 in /backend
 2019-11-26 10:17:54 +01:00
dependabot-preview[bot]
9a8adec87a
build(deps-dev): bump eslint from 6.6.0 to 6.7.1 in /backend 
Bumps [eslint](https://github.com/eslint/eslint) from 6.6.0 to 6.7.1.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v6.6.0...v6.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-26 04:19:15 +00: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
mattwr18
f36ae9a63c Refactor softDeleteMiddleware spec 
- We have been using http requests in our set up in this file, which can
be avoided. We are not trying to test that the report/review workflow
works properly here, we are trying to test that if a resource was
reported, and then disabled, some conditions are true. Certainly, we
will have tests that check that the report, review workflow works as
expected.
 2019-11-25 17:05:04 +01:00
mattwr18
1a5fd29922 Add Claim model 2019-11-25 17:04:47 +01:00
mattwr18
d1606c6b1f Add shoutedBy_some to _PostFilter 
- we have a feature that allows users to publicly show their shouts with
their consent. we need this for the filter to work.
 2019-11-25 12:35:32 +01:00
dependabot-preview[bot]
51c0cd4c83
build(deps): bump date-fns from 2.7.0 to 2.8.1 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.7.0 to 2.8.1.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.7.0...v2.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-25 10:44:01 +00:00
dependabot-preview[bot]
6151890120
build(deps-dev): bump @babel/preset-env from 7.7.1 to 7.7.4 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.1 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.1...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-25 10:41:29 +00:00
Robert Schäfer
2e37c2eeb4
Merge pull request #2343 from Human-Connection/dependabot/npm_and_yarn/backend/babel/node-7.7.4 
build(deps-dev): bump @babel/node from 7.7.0 to 7.7.4 in /backend
 2019-11-25 11:41:29 +01:00
Robert Schäfer
012ba6f8bc
Merge pull request #2345 from Human-Connection/dependabot/npm_and_yarn/backend/validator-12.1.0 
build(deps): bump validator from 12.0.0 to 12.1.0 in /backend
 2019-11-25 11:39:32 +01:00
dependabot-preview[bot]
a7c98389bc
build(deps-dev): bump nodemon from 1.19.4 to 2.0.1 in /backend 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.19.4 to 2.0.1.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.19.4...v2.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-25 04:22:20 +00:00
dependabot-preview[bot]
a6110f7bc9
build(deps): bump validator from 12.0.0 to 12.1.0 in /backend 
Bumps [validator](https://github.com/chriso/validator.js) from 12.0.0 to 12.1.0.
- [Release notes](https://github.com/chriso/validator.js/releases)
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/chriso/validator.js/compare/12.0.0...12.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-25 04:18:45 +00:00
dependabot-preview[bot]
234f618ea9
build(deps-dev): bump @babel/node from 7.7.0 to 7.7.4 in /backend 
Bumps [@babel/node](https://github.com/babel/babel) from 7.7.0 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.0...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-25 04:18:19 +00:00
Wolfgang Huß
4c91675838 Fix lint 2019-11-23 11:41:48 +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ß
8cc05ab910 More complex report and review seeding 2019-11-23 08:58:43 +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ß
b2db3118f2 Add dubios vanished code again 2019-11-22 19:32:13 +01:00