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

10382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
7d87183e87
build(deps-dev): bump @babel/core from 7.7.4 to 7.7.5 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.4 to 7.7.5.
- [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.4...v7.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-09 04:21:20 +00:00
dependabot-preview[bot]
065e55c9be
build(deps-dev): bump @babel/core from 7.7.4 to 7.7.5 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.4 to 7.7.5.
- [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.4...v7.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-09 04:20:46 +00:00
dependabot-preview[bot]
86f546547c
build(deps-dev): bump eslint-loader from 3.0.2 to 3.0.3 in /webapp 
Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/webpack-contrib/eslint-loader/releases)
- [Changelog](https://github.com/webpack-contrib/eslint-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/eslint-loader/compare/v3.0.2...v3.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-09 04:20:43 +00:00
dependabot-preview[bot]
ec69dde031
build(deps-dev): bump @babel/cli from 7.7.4 to 7.7.5 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.7.4 to 7.7.5.
- [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.4...v7.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-09 04:20:21 +00:00
dependabot-preview[bot]
82fcc0d414
build(deps): bump nodemailer from 6.4.0 to 6.4.1 in /backend 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.4.0 to 6.4.1.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v6.4.0...v6.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-09 04:19:30 +00:00
Erhardt Stiefel
93e4712002
Update it.json 2019-12-07 18:40:12 +01:00
Jacob Brennan
08f4d5f0d7 Changed comments to be four times as long (was 300, now 1200 characters) before they are hidden behind show more. Added two tests, one to make sure comments of length > 300 but < 1200 are fully visible, and another to check that comments > 1200 characters are hidden. 2019-12-06 14:52:24 -05:00
mattwr18
3bc944b06d Finish refactoring posts resolver 2019-12-06 18:56:20 +01:00
mattwr18
6ed435364c Start updating posts resolver 2019-12-06 18:29:50 +01:00
mattwr18
6f4ee5f3b7 Refactor resolver/spec 
- favor transaction functions
- add errors undefined, clean up specs
 2019-12-06 17:48:34 +01:00
mattwr18
0e757cf94f Refactor to fix test, DRY out code 2019-12-06 17:48:14 +01:00
mattwr18
a1acd48821 Use verbose variables 2019-12-06 14:56:14 +01:00
mattwr18
da150e0b27 Refactor notificationsMiddleware 
- Use transaction functions
- extract validations into validationsMiddleware
- break notifyUsers into notifyUsersOfMention/notifyUsersOfComment
 2019-12-06 14:48:32 +01:00
Robert Schäfer
65988ea0a1
Merge pull request #2304 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-5.8.9 
build(deps): bump metascraper from 5.8.8 to 5.8.9 in /backend
 2019-12-06 13:49:23 +01:00
Robert Schäfer
714da96a54
Merge pull request #2303 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-video-5.8.9 
build(deps): bump metascraper-video from 5.8.7 to 5.8.9 in /backend
 2019-12-06 13:49:11 +01:00
ogerly
5ae6b3c954 fixed contributionForm.vue 2019-12-06 13:16:40 +01:00
mattwr18
132951c525 Update handleContentDataOfPost to return post 
- fix tests, functionality
 2019-12-06 13:03:05 +01:00
Robert Schäfer
8e9e0be333
Merge pull request #2440 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.10.0 
build(deps): bump neo4j-graphql-js from 2.9.3 to 2.10.0 in /backend
 2019-12-06 12:37:33 +01:00
Robert Schäfer
a3251710fa
Update backend/src/schema/resolvers/users/blockedUsers.spec.js 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-12-06 12:34:33 +01:00
Robert Schäfer
df22f2a5b4
Update backend/src/middleware/hashtags/hashtagsMiddleware.spec.js 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-12-06 12:34:24 +01:00
mattwr18
a8edf46b56
Merge pull request #2422 from Human-Connection/2401-Hide_Donations_Bar 
Hide Donations Bar
 2019-12-06 11:25:55 +01:00
ogerly
652f6d1edc fix reviews ContributionForm, ContributionForm.spec 2019-12-06 10:53:26 +01:00
mattwr18
8a06e9bb25
Merge pull request #2436 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.10.1 
build(deps): bump @sentry/node from 5.10.0 to 5.10.1 in /backend
 2019-12-06 10:44:33 +01:00
mattwr18
2d332e0707
Merge pull request #2437 from Human-Connection/dependabot/npm_and_yarn/cypress-cucumber-preprocessor-1.18.0 
build(deps-dev): bump cypress-cucumber-preprocessor from 1.17.0 to 1.18.0
 2019-12-06 10:44:13 +01:00
mattwr18
0671a0cdf4
Merge pull request #2439 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.13 
build(deps-dev): bump apollo-server-testing from 2.9.12 to 2.9.13 in /backend
 2019-12-06 10:43:55 +01:00
mattwr18
e020c3bfdb
Merge pull request #2441 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.9.13 
build(deps): bump apollo-server from 2.9.12 to 2.9.13 in /backend
 2019-12-06 10:39:24 +01:00
mattwr18
3a455a647a
Merge pull request #2435 from Human-Connection/eliminate_database_calls 
Eliminate database calls for reports query
 2019-12-06 10:36:50 +01:00
ogerly
a62d59741b fix and changes revies, fix lint 2019-12-06 09:16:14 +01:00
Alexander Friedland
dee22d33db
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-06 07:21:49 +01:00
dependabot-preview[bot]
5ee362e411
build(deps): bump apollo-server from 2.9.12 to 2.9.13 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.12 to 2.9.13.
- [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.12...apollo-server@2.9.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-06 04:20:20 +00:00
dependabot-preview[bot]
c0d9fed9eb
build(deps): bump neo4j-graphql-js from 2.9.3 to 2.10.0 in /backend 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.9.3 to 2.10.0.
- [Release notes](https://github.com/neo4j-graphql/neo4j-graphql-js/releases)
- [Changelog](https://github.com/neo4j-graphql/neo4j-graphql-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/neo4j-graphql/neo4j-graphql-js/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-06 04:19:37 +00:00
dependabot-preview[bot]
57696454ca
build(deps-dev): bump apollo-server-testing in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.12 to 2.9.13.
- [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-testing@2.9.12...apollo-server-testing@2.9.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-06 04:19:24 +00:00
dependabot-preview[bot]
a0aa794ebb
build(deps-dev): bump cypress-cucumber-preprocessor 
Bumps [cypress-cucumber-preprocessor](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor) from 1.17.0 to 1.18.0.
- [Release notes](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/releases)
- [Changelog](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/compare/v1.17.0...v1.18.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-06 04:18:22 +00:00
dependabot-preview[bot]
5ca46d8855
build(deps): bump @sentry/node from 5.10.0 to 5.10.1 in /backend 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.10.0 to 5.10.1.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/5.10.0...5.10.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-06 04:18:14 +00:00
roschaefer
fdca5b008b Return empty array instead null for "not reviewed" 
@mattwr18 why did you add the null check in th resolver?
 2019-12-06 02:47:14 +01:00
roschaefer
2f2bf571ed Eliminate database calls for filed and reviewed 
I learned map projections and list comprehensions in cypher tonight!
🎉 So much wow!
 2019-12-06 01:57:49 +01:00
Robert Schäfer
942e74163e
Merge pull request #2430 from Human-Connection/load-svgs-with-babel 
Use babel-loader with vue-svg-loader
 2019-12-05 23:27:24 +01:00
mattwr18
4d0df181b6
Merge pull request #2432 from Human-Connection/remove-query-for-disable-property-for-reports 
Remove disable from reports.disable Query
 2019-12-05 21:14:55 +01:00
mattwr18
9fd4ad47dd
Merge pull request #2317 from Human-Connection/2253-fix-scroll-layout-issue 
2253 fix scroll layout issue
 2019-12-05 21:02:10 +01:00
roschaefer
77fb948c14 Fix cypress tests 2019-12-05 21:00:24 +01:00
roschaefer
b7e36345b9 Remove backendHost 2019-12-05 21:00:24 +01:00
roschaefer
825ad6d266 Fix cypress tests 
Since `dotenv` in the backend now loads configuration from a file
relative to the current file, we don't have to duplicate the neo4j
configuration settings here.
 2019-12-05 21:00:24 +01:00
roschaefer
8f0ce19f09 Implement getDriver() and getNeode() the same way 
I want to introduce `neode` and `neo4j-graphql-js` to my students and
saw this.
 2019-12-05 21:00:24 +01:00
Robert Schäfer
b7be0f100b
Merge pull request #2424 from Human-Connection/update-test-description 
Update test description
 2019-12-05 20:55:59 +01:00
Robert Schäfer
4b12ddb87c
Merge pull request #2419 from Human-Connection/update-yarn-lock 
Update yarn.lock after pulling in latest changes
 2019-12-05 20:54:44 +01:00
mattwr18
1827889582 Refactor notificationsMiddleware/locations 
- start refactoring
- locations does not have any automated tests, which makes it more
difficult to refactor and have confidence that functionality will not be
broken
- notificationsMiddleware in progress
 2019-12-05 20:42:45 +01:00
mattwr18
2827a6ae38
Merge pull request #2417 from Human-Connection/2387-fix-incorrect-privacy-page-path 
Update privacy path
 2019-12-05 20:36:11 +01:00
mattwr18
55f25b153c Remove disable from models/Report.js 
- we are not setting this property, and it's inclusion in this model
with a default false value meant that there were no errors with seeded
data, but with the data returned from the db_manipulation there was.
 2019-12-05 20:31:19 +01:00
mattwr18
b82e6f4d81 Move db script to neo4j/db_manipulation directory 2019-12-05 19:57:53 +01:00
mattwr18
517963174b We are not setting disable on Report node 
- we are adding the report rule which says that if a resource was
disabled by a report with this rule, then the latest review was the one
that disabled it.
- fix db script/ add new directory for keeping record of db scripts
 2019-12-05 19:52:05 +01:00