IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-14 08:54:44 +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
dependabot-preview[bot]
a42a910ac7
build(deps-dev): bump eslint-plugin-jest in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.17.0 to 22.19.0.
- [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/v22.17.0...v22.19.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-15 12:01:43 +00:00
Robert Schäfer
6ddac7d737
Merge pull request #1894 from Human-Connection/dependabot/docker/webapp/node-12.12.0-alpine 
build(deps): bump node from 12.11.1-alpine to 12.12.0-alpine in /webapp
 2019-10-15 13:59:18 +02:00
Robert Schäfer
fe52846e7c
Merge pull request #1897 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.2.4 
build(deps-dev): bump @storybook/vue from 5.2.3 to 5.2.4 in /webapp
 2019-10-15 13:59:02 +02:00
Alina Beck
6318ced7a0 refactor comment component to just use one content viewer 2019-10-15 14:52:02 +03:00
ogerly
855caf78e9 reference to terms of use, data protection, minimum age at added 2019-10-15 13:05:51 +02:00
Alina Beck
cd9f2633d7 highlight comment targeted in anchor link 2019-10-15 12:09:01 +03:00
dependabot-preview[bot]
b5d0170ab4
build(deps): bump node from 12.11.1-alpine to 12.12.0-alpine in /webapp 
Bumps node from 12.11.1-alpine to 12.12.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-15 08:53:30 +00:00
dependabot-preview[bot]
251c0d93e4
build(deps-dev): bump @storybook/vue from 5.2.3 to 5.2.4 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.2.3 to 5.2.4.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.4/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-15 08:49:40 +00:00
mattwr18
11c1f28f18
Merge pull request #1895 from Human-Connection/dependabot/docker/backend/node-12.12.0-alpine 
build(deps): bump node from 12.11.1-alpine to 12.12.0-alpine in /backend
 2019-10-15 10:49:11 +02:00
mattwr18
5df108a89a
Merge pull request #1896 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/sentry-3.0.1 
build(deps): bump @nuxtjs/sentry from 3.0.0 to 3.0.1 in /webapp
 2019-10-15 10:48:21 +02:00
mattwr18
c6d8838757
Merge pull request #1898 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.2.4 
build(deps-dev): bump @storybook/addon-actions from 5.2.3 to 5.2.4 in /webapp
 2019-10-15 10:46:23 +02:00
dependabot-preview[bot]
9aa486f060
build(deps-dev): bump @storybook/addon-actions in /webapp 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.2.3 to 5.2.4.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.4/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-15 07:08:05 +00:00
dependabot-preview[bot]
34b441a5aa
build(deps): bump @nuxtjs/sentry from 3.0.0 to 3.0.1 in /webapp 
Bumps [@nuxtjs/sentry](https://github.com/nuxt-community/sentry-module) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/nuxt-community/sentry-module/releases)
- [Changelog](https://github.com/nuxt-community/sentry-module/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/sentry-module/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-15 07:06:54 +00:00
dependabot-preview[bot]
319de54265
build(deps): bump node from 12.11.1-alpine to 12.12.0-alpine in /backend 
Bumps node from 12.11.1-alpine to 12.12.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-15 07:06:25 +00:00
mattwr18
37bf37f39b
Merge pull request #1878 from Human-Connection/1707-refactor-db-reporting-with-specific-information 
🍰 Refactor Database for Reporting with specific information
 2019-10-15 08:30:21 +02:00
mattwr18
6e10a1063c
Merge pull request #1890 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.10.1 
build(deps): bump nuxt from 2.10.0 to 2.10.1 in /webapp
 2019-10-15 08:28:18 +02:00
mattwr18
a3f4282bae
Merge pull request #1868 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.6.4 
build(deps-dev): bump @babel/cli from 7.6.3 to 7.6.4 in /backend
 2019-10-15 08:23:50 +02:00
mattwr18
5b6b377d40
Merge pull request #1864 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.9.6 
build(deps): bump apollo-server from 2.9.5 to 2.9.6 in /backend
 2019-10-15 07:11:22 +02:00
mattwr18
807c3e1972 Update missed reasonCategory param in cypress test 2019-10-15 00:33:54 +02:00
dependabot-preview[bot]
c8fdaef729
build(deps): bump apollo-server from 2.9.5 to 2.9.6 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.5 to 2.9.6.
- [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.5...apollo-server@2.9.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-14 21:54:45 +00:00
mattwr18
02def215b7
Merge pull request #1870 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.6 
build(deps-dev): bump apollo-server-testing from 2.9.5 to 2.9.6 in /backend
 2019-10-14 23:52:40 +02:00
dependabot-preview[bot]
75d8b6f3fb
build(deps): bump nuxt from 2.10.0 to 2.10.1 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.10.0 to 2.10.1.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.10.0...v2.10.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-14 21:29:00 +00:00
mattwr18
1b1ede583f
Merge pull request #1867 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.6.4 
build(deps-dev): bump @babel/core from 7.6.3 to 7.6.4 in /webapp
 2019-10-14 23:25:55 +02:00
mattwr18
f9fe93e550 Update reportListQuery to not request resourceId back 2019-10-14 21:56:28 +02:00
mattwr18
8e34b9581b Update sneaky report mutation 2019-10-14 21:45:46 +02:00
mattwr18
8e8180501f
Merge pull request #1892 from Human-Connection/dependabot/npm_and_yarn/webapp/core-js-2.6.10 
build(deps-dev): bump core-js from 2.6.9 to 2.6.10 in /webapp
 2019-10-14 21:33:27 +02:00
mattwr18
76df66806c
Merge pull request #1891 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/apollo-4.0.0-rc15 
build(deps): bump @nuxtjs/apollo from 4.0.0-rc14 to 4.0.0-rc15 in /webapp
 2019-10-14 21:29:41 +02:00
mattwr18
df090944bf
Merge pull request #1871 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.7.0 
build(deps): bump @sentry/node from 5.6.2 to 5.7.0 in /backend
 2019-10-14 21:28:27 +02:00
dependabot-preview[bot]
30c3cf3e1d
build(deps-dev): bump apollo-server-testing in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.5 to 2.9.6.
- [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.5...apollo-server-testing@2.9.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-14 19:28:23 +00:00
dependabot-preview[bot]
d34018f6d4
build(deps-dev): bump @babel/core from 7.6.3 to 7.6.4 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.6.3 to 7.6.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.6.3...v7.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-14 19:28:20 +00:00
dependabot-preview[bot]
01c9e083eb
build(deps-dev): bump @babel/cli from 7.6.3 to 7.6.4 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.6.3 to 7.6.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.6.3...v7.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-14 19:27:36 +00:00
mattwr18
f3bb8ee3a1
Merge pull request #1869 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-3.12.0 
build(deps-dev): bump @vue/cli-shared-utils from 3.11.0 to 3.12.0 in /webapp
 2019-10-14 21:27:26 +02:00
mattwr18
03e51e91c6
Merge pull request #1866 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-express-2.9.6 
build(deps): bump apollo-server-express from 2.9.5 to 2.9.6 in /backend
 2019-10-14 21:26:37 +02:00
mattwr18
98a7bb8cee
Merge pull request #1865 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.6.4 
build(deps-dev): bump @babel/core from 7.6.2 to 7.6.4 in /backend
 2019-10-14 21:25:33 +02:00
Kapil Jain
f73ff995e1 fixed lint errors 2019-10-14 15:17:49 -04:00
mattwr18
63cc82edea
Merge pull request #1666 from Human-Connection/1466_image_cropping 
🍰 Implement basic image cropping solution
 2019-10-14 21:12:11 +02:00
mattwr18
faf0a15aee Update to use enum in tests, seed data, etc, refactor resolver 
- Extract validations to the validations middleware to clean it up
- Remove resourceId since it throws an error in the mutation if the user
asks for it back, and the resourceId is returned in post/comment/user.id
- use writeTxResultPromise to benefit from automatic retries
- more descriptive variable naming
- extract cypher query to make db manipulation into script so that it
can be run from the command line, at least locally.
 2019-10-14 21:07:55 +02:00
mattwr18
e307211ada
Keep button on top of crop overlay, but below navbar 
Co-Authored-By: Alina Beck <alina.beck@mail.com>
 2019-10-14 19:16:02 +02:00
mattwr18
b605dd12c5
Keep images from distorting or getting cropped 
great explanation by @alina-beck

Co-Authored-By: Alina Beck <alina.beck@mail.com>
 2019-10-14 19:15:22 +02:00
mattwr18
3e72660ed8
Keep images from distorting or getting cropped 
Co-Authored-By: Alina Beck <alina.beck@mail.com>
 2019-10-14 19:14:27 +02:00
mattwr18
b2cb65e942
Keep images from distorting or getting cropped 
Co-Authored-By: Alina Beck <alina.beck@mail.com>
 2019-10-14 19:13:00 +02:00
Wolfgang Huß
cae897808b Follow Matts suggestions from his review 2019-10-14 17:38:38 +02:00
mattwr18
c45f63ffd9 Follow @alina-beck PR suggestions 2019-10-14 16:42:11 +02:00
mattwr18
1c6b5f941b Remove aspect ratio on cropper, limit to max-height 2000px 
- discussed it today's internal meeting and agreed upon with
@alina-beck, @Tirokk, @ogerly, @datenbrei, Dennis Hack

- max-height was a suggestion and can be changed at any time
 2019-10-14 16:42:11 +02:00
mattwr18
c85b2d49b6 Remove outdated test directly calling method 2019-10-14 16:42:11 +02:00
mattwr18
0d5b334f66 Remove unneeded max-heights 2019-10-14 16:42:11 +02:00
mattwr18
cabd68f7d8 Clean up code 
- Set dropzoneOptions.url to arrow function which returns empty
string... url is required, but we don't use a restful api, we crop the
image and save the update file(blob) to an image

- set min-height of vuedropzone to 500px to be closer to the cropped
image and to center image overlay

- remove dz-message div, as one is already created automatically by
vue2-dropzone
 2019-10-14 16:42:11 +02:00
mattwr18
2818b63fe9 Fix lint 2019-10-14 16:42:11 +02:00
mattwr18
3beddf1f69 Contain post/contribution form to limit width 
- enforce 1.25:1 aspect ratio to be as close to possible with the 1:1
aspect ratio on our root path where we have 3 columns of 300px and a
max-height of 300px
 2019-10-14 16:42:11 +02:00
mattwr18
db48e522cf Enforce a 16/9 aspect ratio 
- if we set the max height any greater than this, it takes up the entire
page on a desktop screen
 2019-10-14 16:42:11 +02:00