7470 Commits

Author SHA1 Message Date
mattwr18
b232b038ec
Merge pull request #2455 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.7.6
build(deps-dev): bump @babel/preset-env from 7.7.4 to 7.7.6 in /backend
2019-12-10 14:41:18 +01:00
mattwr18
097afbf764
Merge pull request #2458 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.7.5
build(deps-dev): bump @babel/cli from 7.7.4 to 7.7.5 in /backend
2019-12-10 14:41:01 +01:00
mattwr18
1d7a728ea3
Merge pull request #2473 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.10.2
build(deps): bump @sentry/node from 5.10.1 to 5.10.2 in /backend
2019-12-10 14:30:25 +01:00
mattwr18
2633597f7d
Merge pull request #2474 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-import-2.19.1
build(deps-dev): bump eslint-plugin-import from 2.18.2 to 2.19.1 in /backend
2019-12-10 14:29:42 +01:00
mattwr18
a9cfd25c2a
Merge pull request #2475 from Human-Connection/dependabot/npm_and_yarn/webapp/css-loader-3.3.0
build(deps-dev): bump css-loader from 3.2.1 to 3.3.0 in /webapp
2019-12-10 14:29:21 +01:00
mattwr18
06163e85fe
Merge pull request #2477 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-import-2.19.1
build(deps-dev): bump eslint-plugin-import from 2.18.2 to 2.19.1 in /webapp
2019-12-10 14:29:04 +01:00
mattwr18
65cf8e4792
Merge pull request #2443 from Human-Connection/2237-longer-comments
Fix #2237, Comments 4 times as long before "show more"
2019-12-10 11:07:24 +01:00
mattwr18
4af63ee0aa
Merge pull request #2404 from Human-Connection/get_rid_of_inconsistency_with_setup_neode
Get rid of inconsistency with neode setup
2019-12-10 11:04:35 +01:00
mattwr18
383ef035c0
Merge pull request #2468 from Human-Connection/bump-styleguide-version
Bump styleguide to version 0.5.22
2019-12-10 09:56:35 +01:00
Alina Beck
fef65729a6 update lockfile 2019-12-10 10:21:14 +03:00
dependabot-preview[bot]
eef7eb4b0f
build(deps-dev): bump eslint-plugin-import in /webapp
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.18.2 to 2.19.1.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.18.2...v2.19.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-10 04:21:35 +00:00
dependabot-preview[bot]
caceb0d83d
build(deps-dev): bump css-loader from 3.2.1 to 3.3.0 in /webapp
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.2.1 to 3.3.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.2.1...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-10 04:20:10 +00:00
dependabot-preview[bot]
9d992897f0
build(deps-dev): bump eslint-plugin-import in /backend
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.18.2 to 2.19.1.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.18.2...v2.19.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-10 04:19:26 +00:00
dependabot-preview[bot]
d112b33577
build(deps): bump @sentry/node from 5.10.1 to 5.10.2 in /backend
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.10.1 to 5.10.2.
- [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.1...5.10.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-10 04:18:54 +00:00
Robert Schäfer
6dd435a4d1
Merge pull request #2456 from Human-Connection/dependabot/npm_and_yarn/backend/nodemailer-6.4.1
build(deps): bump nodemailer from 6.4.0 to 6.4.1 in /backend
2019-12-09 22:18:44 +01:00
dependabot-preview[bot]
be8b712bb9
build(deps-dev): bump @babel/preset-env from 7.7.4 to 7.7.6 in /backend
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.4 to 7.7.6.
- [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.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-09 21:18:27 +00:00
Robert Schäfer
1fb442db07
Merge branch 'master' into dependabot/npm_and_yarn/backend/babel/cli-7.7.5 2019-12-09 22:18:15 +01:00
Robert Schäfer
147cc73adb
Merge pull request #2459 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-loader-3.0.3
build(deps-dev): bump eslint-loader from 3.0.2 to 3.0.3 in /webapp
2019-12-09 22:17:32 +01:00
Robert Schäfer
e3fcb9adbd
Merge pull request #2460 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.7.5
build(deps-dev): bump @babel/core from 7.7.4 to 7.7.5 in /backend
2019-12-09 22:17:16 +01:00
Robert Schäfer
4dd548174d
Merge pull request #2461 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.7.5
build(deps-dev): bump @babel/core from 7.7.4 to 7.7.5 in /webapp
2019-12-09 22:16:39 +01:00
Robert Schäfer
c2924a1886
Merge pull request #2463 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.7.6
build(deps-dev): bump @babel/preset-env from 7.7.4 to 7.7.6 in /webapp
2019-12-09 22:16:15 +01:00
Robert Schäfer
8d2ed484ea
Merge pull request #2464 from Human-Connection/dependabot/npm_and_yarn/webapp/async-validator-3.2.3
build(deps-dev): bump async-validator from 3.2.2 to 3.2.3 in /webapp
2019-12-09 22:15:54 +01:00
Robert Schäfer
4ebf7a281f
Merge pull request #2465 from Human-Connection/dependabot/submodules/styleguide-7ef8340
build(deps): bump styleguide from `808b3c5` to `7ef8340`
2019-12-09 22:15:25 +01:00
mattwr18
a370c56b0b
Merge pull request #2466 from Human-Connection/2442-paginate-moderation-page
Paginate moderations page without losing filtering
2019-12-09 21:23:12 +01:00
roschaefer
5271337b49 Reduce the number of database calls even more 2019-12-09 18:49:27 +01:00
mattwr18
60bf819a56 Remove counts to make less expensive db requests 2019-12-09 17:41:38 +01:00
Alina Beck
b7970e701c
Bump styleguide to version 0.5.22 2019-12-09 18:59:16 +03:00
mattwr18
79c6bd5c20 Paginate moderations page without losing filtering
Co-authored-by: Tirokk <wolle.huss@pjannto.com>
2019-12-09 16:37:04 +01:00
Robert Schäfer
f41b52f6e0
Merge pull request #2451 from Human-Connection/erhardtstiefel-patch-8
Update it.json
2019-12-09 15:37:23 +01:00
dependabot-preview[bot]
9a9ccc59fa
build(deps): bump styleguide from 808b3c5 to 7ef8340
Bumps [styleguide](https://github.com/Human-Connection/Nitro-Styleguide) from `808b3c5` to `7ef8340`.
- [Release notes](https://github.com/Human-Connection/Nitro-Styleguide/releases)
- [Commits](808b3c5a95...7ef8340500)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-09 04:45:47 +00:00
dependabot-preview[bot]
65c4b1e43e
build(deps-dev): bump async-validator from 3.2.2 to 3.2.3 in /webapp
Bumps [async-validator](https://github.com/yiminghe/async-validator) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/yiminghe/async-validator/releases)
- [Changelog](https://github.com/yiminghe/async-validator/blob/master/HISTORY.md)
- [Commits](https://github.com/yiminghe/async-validator/compare/v3.2.2...v3.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-09 04:22:27 +00:00
dependabot-preview[bot]
ca9c73dc53
build(deps-dev): bump @babel/preset-env from 7.7.4 to 7.7.6 in /webapp
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.4 to 7.7.6.
- [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.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-09 04:21:55 +00:00
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
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
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
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