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

1996 Commits

Author SHA1 Message Date
mattwr18
e4aba5d4df Add test case/Fix message 
- Test that the rule is automatically created for new reviews
- Improve English message
 2019-12-02 13:56:44 +01:00
mattwr18
c05065f684 Refactor backend 
- update script
- use readTxResult for validateReview
- favor more verbose variables
- do not set review.closed as we close the report and the rule at the
moment is set to 'latestReviewUpdatedAtRules' rule, so it's clear the
last review must have been the one that closed the report
 2019-12-02 13:38:35 +01:00
mattwr18
14a689d955 Remove comments 2019-12-02 12:02:15 +01:00
mattwr18
08227d3f86
Merge pull request #2390 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-23.1.1 
build(deps-dev): bump eslint-plugin-jest from 23.0.5 to 23.1.1 in /backend
 2019-12-02 11:47:43 +01:00
mattwr18
b6accd8d15
Merge pull request #2388 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-6.7.2 
build(deps-dev): bump eslint from 6.7.1 to 6.7.2 in /backend
 2019-12-02 11:47:17 +01:00
mattwr18
b3bb8ac0e4
Merge pull request #2366 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.7.4 
build(deps-dev): bump @babel/cli from 7.7.0 to 7.7.4 in /backend
 2019-12-02 11:37:58 +01:00
dependabot-preview[bot]
393d2dec02
build(deps-dev): bump eslint-plugin-jest in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.5 to 23.1.1.
- [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.5...v23.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 04:19:00 +00:00
dependabot-preview[bot]
dd71c80f34
build(deps-dev): bump eslint from 6.7.1 to 6.7.2 in /backend 
Bumps [eslint](https://github.com/eslint/eslint) from 6.7.1 to 6.7.2.
- [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.7.1...v6.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 04:18:25 +00:00
mattwr18
c088c6eac4 Refactor test to avoid unneccessary http request 
- Set up/tear down should not needlessly run http requests. These tests
are not designed to test that the report/review process works as
expected. that is the job of their respective unit tests/e2e tests.
 2019-11-29 20:48:11 +01:00
mattwr18
7441dbf28c Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-29 20:43:09 +01:00
mattwr18
bbd80fbc23 Add test cases for review workflow 2019-11-29 19:45:52 +01:00
mattwr18
f5545e3976 Fix middleware/spec 2019-11-29 19:45:34 +01:00
mattwr18
5d63dda6ee Refactor validateReport/Review 
- Don't throw error if a report already exists since we use MERGE and
that does not create a new resource if it exists. That is tested at the
neo4j(database) level.
- We also have a test to make in reports.spec.js that no duplicate is
created to ensure we didn't make some error on our part.
- Fix some faulty logic in validateReview
 2019-11-29 18:47:41 +01:00
mattwr18
c0d9fe5257 Test validationMiddleware validateReport/Review 2019-11-29 18:43:24 +01:00
mattwr18
b7f0bc7164
Merge pull request #2375 from Human-Connection/keep_dots_in_emails 
Don't remove sub-addresses in emails
 2019-11-29 14:14:25 +01:00
mattwr18
2e54a43417
Merge pull request #2333 from Human-Connection/remove_obsolete_invitation_code 
refactor: Remove obsolete code about invitation codes
 2019-11-29 13:45:46 +01:00
roschaefer
76414dbec7 Fix lint 2019-11-28 18:07:00 +01:00
mattwr18
9990fe2cb2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-28 16:14:23 +01:00
mattwr18
89daa3356c Return reviews with reports, rename variables 
- Instead of just returning the moderator who reviewed, we return the
review as well
 2019-11-28 16:10:33 +01:00
roschaefer
973d3f899a Remove dots of gmail addresses 
I had a chat with our moderator Daniel. He asks us to remove dots from
gmail accounts. He finds it more consistent and he has no problem to
write a mail to a gmail address without dots. He is OK to save the
email address different from how a user memorizes it.
 2019-11-28 14:02:11 +01:00
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