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

4261 Commits

Author SHA1 Message Date
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
Wolfgang Huß
99af6cbf8a Implement displaying multiple claims in the frontend 2019-11-22 18:40:51 +01:00
mattwr18
0a96f3ed6f
Merge pull request #2330 from Human-Connection/2329-normalize_emails_in_login_form 
2329 normalize emails in login form
 2019-11-22 16:30:56 +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ß
9a7774ce86 Implement review validation with validateReview 2019-11-22 15:19:49 +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
dependabot-preview[bot]
f3ae92aa3e
build(deps): bump metascraper from 5.8.8 to 5.8.9 in /backend 
Bumps [metascraper](https://github.com/microlinkhq/metascraper) from 5.8.8 to 5.8.9.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.8...v5.8.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-22 09:14:37 +00:00
dependabot-preview[bot]
1563cc8656
build(deps): bump metascraper-video from 5.8.7 to 5.8.9 in /backend 
Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 5.8.7 to 5.8.9.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.7...v5.8.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-22 09:14:33 +00:00
mattwr18
08d78a2005
Merge pull request #2318 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.12 
build(deps-dev): bump apollo-server-testing from 2.9.9 to 2.9.12 in /backend
 2019-11-22 10:14:13 +01:00
mattwr18
95b500be05
Merge pull request #2301 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-lang-5.8.9 
build(deps): bump metascraper-lang from 5.8.7 to 5.8.9 in /backend
 2019-11-22 10:13:05 +01:00
mattwr18
0aea441e2b
Merge pull request #2298 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.8.9 
build(deps): bump metascraper-soundcloud from 5.8.7 to 5.8.9 in /backend
 2019-11-22 10:12:44 +01:00