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

9189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mattwr18
40e1475525 Update to version 0.1.11 with bug fixes 2019-11-25 15:39:36 +01:00
mattwr18
6a66176e28
Merge pull request #2350 from Human-Connection/2349-fix-updating-post-image-submit-bug 
Fix updating post by adding/changing image bug submits form
 2019-11-25 15:37:20 +01:00
mattwr18
554fab2242
Merge pull request #2353 from Human-Connection/2352-fix-shoutedBy_some-filter 
Add shoutedBy_some to _PostFilter
 2019-11-25 15:36:38 +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]
587fb81599
build(deps): bump validator from 12.0.0 to 12.1.0 in /webapp 
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 10:42:16 +00:00
Robert Schäfer
f6d09ffe3e
Merge pull request #2342 from Human-Connection/dependabot/npm_and_yarn/date-fns-2.8.1 
build(deps-dev): bump date-fns from 2.8.0 to 2.8.1
 2019-11-25 11:41:56 +01:00
dependabot-preview[bot]
69ea174ac8
build(deps-dev): bump @babel/core from 7.7.2 to 7.7.4 in /webapp 
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-25 10:41:55 +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
Alina Beck
171d876bfd
Update webapp/components/_new/generic/BaseIcon/BaseIcon.vue 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-11-25 13:39:52 +03: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
Robert Schäfer
5c57265e31
Merge pull request #2346 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.7.4 
build(deps-dev): bump @babel/preset-env from 7.7.1 to 7.7.4 in /webapp
 2019-11-25 11:39:17 +01:00
Robert Schäfer
4ec5992e6f
Merge pull request #2347 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-6.7.1 
build(deps-dev): bump eslint from 6.6.0 to 6.7.1 in /webapp
 2019-11-25 11:38:56 +01:00
Robert Schäfer
b3b8640cd1
Merge pull request #2348 from Human-Connection/dependabot/npm_and_yarn/backend/nodemon-2.0.1 
build(deps-dev): bump nodemon from 1.19.4 to 2.0.1 in /backend
 2019-11-25 11:38:35 +01:00
ogerly
f7aeb3c616 added checkbox for blure Images in contribution form 2019-11-25 11:23:57 +01:00
mattwr18
1667669d12 Fix bug by adding event modifiers stop and prevent 2019-11-25 11:10:21 +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]
5e04ba0c63
build(deps-dev): bump eslint from 6.6.0 to 6.7.1 in /webapp 
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-25 04:19:54 +00:00
dependabot-preview[bot]
a756892b7f
build(deps-dev): bump @babel/preset-env from 7.7.1 to 7.7.4 in /webapp 
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 04:19:19 +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
dependabot-preview[bot]
8fd2f07605
build(deps-dev): bump date-fns from 2.8.0 to 2.8.1 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.8.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.8.0...v2.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-25 04:18:05 +00:00
Alexander Friedland
dd0f629691
Merge branch 'master' into 2170-Change_of_Terms_of_Service 2019-11-24 21:52:41 +01:00
Wolfgang Huß
4d645ebc04 Correct mutation to display the comment disabling right 2019-11-23 13:11:09 +01:00
Wolfgang Huß
1574a6cdb6 Check database manipulation script again 2019-11-23 12:32:01 +01:00
Wolfgang Huß
043b951459 Try avoid modal to show success on error, but not successful 2019-11-23 11:42:46 +01:00
Wolfgang Huß
4c91675838 Fix lint 2019-11-23 11:41:48 +01:00
Wolfgang Huß
8a4ca956e8 Rename variable 2019-11-23 11:20:16 +01:00
Wolfgang Huß
116d597d24 Cleaned SCSS 2019-11-23 11:11:00 +01:00
Wolfgang Huß
a8a99e763c Fix client-side rendered virtual DOM warnings 2019-11-23 11:05:41 +01:00
Wolfgang Huß
67a5a00704 Clean up 2019-11-23 10:58:16 +01:00
Wolfgang Huß
2f07d528e4 View status icon under type icon 2019-11-23 10:49:34 +01:00
Wolfgang Huß
6890ef25be Add sorting to resource claims and reports lists 2019-11-23 10:34:55 +01:00