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
10,123 Commits 5 Branches 2 Tags
Commit Graph

10123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
f42eea15a6
Merge pull request #2323 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.8.1 
build(deps): bump date-fns from 2.7.0 to 2.8.1 in /webapp
 2019-11-27 18:11:08 +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
5d80eca711
Merge pull request #2169 from Human-Connection/1967-Component-Tests-ContentView 
1967 component tests content view
 2019-11-27 18:03:36 +01:00
mattwr18
1f7d8a023e Update reports query in frontend 2019-11-27 17:45:32 +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
Moriz Wahl
b2f2783f4f Merge branch 'master' into 1967-Component-Tests-ContentView 
Resolving conflicts
 2019-11-27 14:56:55 +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
Moriz Wahl
d47ebb936e use .filter to find items 2019-11-27 14:28:57 +01:00
Moriz Wahl
809ef47a03 only one expect per it block 2019-11-27 14:28:57 +01:00
Moriz Wahl
3d3a121dc5 method tests added 2019-11-27 14:28:57 +01:00
Moriz Wahl
e4883b5175 method tests added 2019-11-27 14:28:57 +01:00
Moriz Wahl
a14b3cb39a spec file added with basic test logic 2019-11-27 14:28:57 +01:00
Moriz Wahl
3b49744b51 directory created a path names changed 2019-11-27 14:28:57 +01:00
mattwr18
2332576e17 Add imageAspectRatio to seeded Post 2019-11-27 12:08:21 +01:00
Alina Beck
2b1f0b1c4a
Merge pull request #2288 from Human-Connection/migrate-styleguide-icons 
Migrate styleguide icons
 2019-11-27 13:28:56 +03:00
Moriz Wahl
317b335c80 use .filter to find items 2019-11-27 11:18:46 +01:00
Moriz Wahl
03e7ffa442 only one expect per it block 2019-11-27 10:26:31 +01:00
Moriz Wahl
cd3156c8c7 method tests added 2019-11-27 10:26:31 +01:00
Moriz Wahl
186a2f1abe method tests added 2019-11-27 10:26:31 +01:00
Moriz Wahl
b1b607c1b7 spec file added with basic test logic 2019-11-27 10:26:31 +01:00
Moriz Wahl
7616682a8e directory created a path names changed 2019-11-27 10:26:31 +01:00
Alina Beck
1dc68cbae8 follow @Roschaefer suggestions 2019-11-27 11:51:30 +03:00
ogerly
d75c02c057 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1746-Blur_explicit_Image_Content 2019-11-27 08:34:59 +01:00
dependabot-preview[bot]
448c29a39b
build(deps-dev): bump eslint-plugin-jest in /webapp 
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:22:56 +00: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
dependabot-preview[bot]
dba23268c7
build(deps): bump date-fns from 2.7.0 to 2.8.1 in /webapp 
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-26 09:20:37 +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
700182e29a
Merge pull request #2340 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.7.4 
build(deps-dev): bump @babel/core from 7.7.2 to 7.7.4 in /webapp
 2019-11-26 10:18:51 +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
mattwr18
d9344655a4
Merge pull request #2319 from Human-Connection/dependabot/npm_and_yarn/webapp/validator-12.1.0 
build(deps): bump validator from 12.0.0 to 12.1.0 in /webapp
 2019-11-26 10:17:14 +01:00
ogerly
563cbed346 merge master 2019-11-26 07:57:57 +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
ff404e3c37 Fix graphql mutation for returned Claim 2019-11-25 19:02:58 +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
mattwr18
ba412dfadf
Merge pull request #2354 from Human-Connection/update-to-version-0.1.11 
Update to version 0.1.11 with bug fixes
 2019-11-25 17:28:55 +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