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

7494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
roschaefer
cc7cd6b8b0 Fix backend tests 2019-12-10 18:13:34 +01:00
mattwr18
4f0df2f28f Remove disable from query request 
- we removed it, prevent null pointer error
 2019-12-10 18:09:32 +01:00
mattwr18
0a50a02f88 Follow @roschaefer suggestion/remove guard clauses 2019-12-10 18:09:32 +01:00
mattwr18
12236c9324 Convert to transaction function/refactor 
- update incorrect variables
 2019-12-10 18:09:32 +01:00
roschaefer
deefc4e12f Improve notification query performance 
Just don't ask for stuff that you don't want to show anyways
 2019-12-10 18:09:32 +01:00
roschaefer
3beef5e3fb Reduce database statements in notifications 2019-12-10 18:09:32 +01:00
roschaefer
b2ccc1b61e Better debugging 2019-12-10 18:09:32 +01:00
mattwr18
84edde273d
Merge pull request #2467 from Human-Connection/revert-layout-changes-imageAspectRatio 
Revert layout changes image aspect ratio
 2019-12-10 17:41:53 +01:00
mattwr18
4293fb845b
Merge pull request #2472 from Human-Connection/quickfix_for_nullpointer_error_in_user_vue 
Quick fix for null pointer error in User.vue
 2019-12-10 15:51:11 +01:00
mattwr18
da169d5d14 Revert changes to test 2019-12-10 15:40:03 +01:00
mattwr18
fb4f487abd Revert layout changes for imageAspectRatio 
- we still add the imageAspectRatio for new posts, but we don't do
anything with the layout until we figure out how to add
imageAspectRatios for every post with an image in the database without
causing a big downtime
 2019-12-10 15:40:03 +01:00
Robert Schäfer
1b787d7687
Merge pull request #2416 from Human-Connection/checkbox_no_comercial_add_to_creatUserAccount 
Checkbox 'no comercial + no political account' add to creat user account
 2019-12-10 15:21:40 +01:00
mattwr18
bc6b1c1a8c
Merge pull request #2421 from Human-Connection/remove-data-test-attributes-in-production 
Remove data-test attriubutes in non-dev env
 2019-12-10 14:44:34 +01:00
mattwr18
19b4fcd9c6
Merge pull request #2452 from Human-Connection/dependabot/npm_and_yarn/babel/preset-env-7.7.6 
build(deps-dev): bump @babel/preset-env from 7.7.4 to 7.7.6
 2019-12-10 14:41:36 +01:00
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
9703066699 Rename prop name following @roschaefer suggestion 
- missed in previous PR
 2019-12-10 14:37:05 +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
ce659b8c56 Merge branch 'master' of github.com:Human-Connection/Human-Connection into quickfix_for_nullpointer_error_in_user_vue 2019-12-10 14:28:10 +01:00
mattwr18
bcf602fe77 Use more verbose naming 
- Co-authored-by: Alina Beck <alina.beck@mail.com>
 2019-12-10 14:08:13 +01:00
mattwr18
27a2ccd9ae Merge branch 'master' of github.com:Human-Connection/Human-Connection into remove-data-test-attributes-in-production 2019-12-10 13:31:10 +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
roschaefer
30870d832b Quick fix for null pointer error 
`this.openMenu` is not a function`
 2019-12-10 02:47:19 +01: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
dependabot-preview[bot]
fd82775779
build(deps-dev): bump @babel/preset-env from 7.7.4 to 7.7.6 
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:13 +00: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