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

6261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
mattwr18
fa06696892 Convert canvas to blob to update file 
- what was happening is that the file was being autocropped still and
sent to the backend with cropperjs autocrop... these changes update the
file's attributes so they can be saved properly
 2019-10-14 16:42:11 +02:00
Brent Vardy
227db5f13a refactored tranformImage to remove dupication 
- styled confirm button
- added locale translations
- added dropzoneDrop method to handle scenario where users drag and drop an image whilst in the cropper interface.

- co-authored-by: mattwr18 <mattwr18@gmail.com>
 2019-10-14 16:42:11 +02:00
mattwr18
b089e82434 Configure jest to mock CSS modules 
- getting error from import cropperjs css
 2019-10-14 16:42:11 +02:00
mattwr18
45dfc5cff1 Contain cropper overlay in image preview area 
- Co-authored-by: Brent Vardy <brent.vardy@challengelogic.net>
 2019-10-14 16:42:10 +02:00
Brent Vardy
fdcf2b5300 [WIP] - implement basic image cropping solution 
#1466

- co-authored-by: mattwr18 <mattwr18@gmail.com>
 2019-10-14 16:42:10 +02:00
Brent Vardy
d59defedf3 [WIP] - implement basic image cropping solution 
#1466

- co-authored-by: mattwr18 <mattwr18@gmail.com>
 2019-10-14 16:42:10 +02:00
mattwr18
1d7dc8f9ff
Merge pull request #1884 from Human-Connection/1773_refactor-rewards-spec 
1773 refactor rewards spec
 2019-10-14 16:32:23 +02:00
aonomike
47a2a21fc0 Resolve review comments 2019-10-14 16:46:37 +03:00
Wolfgang Huß
3bb4d67350
Merge pull request #1863 from Human-Connection/1645_case_insensitive_email 
fix: search for email case-insensitively
 2019-10-14 11:01:26 +02:00
dependabot-preview[bot]
a95e55ce34
build(deps-dev): bump core-js from 2.6.9 to 2.6.10 in /webapp 
Bumps [core-js](https://github.com/zloirock/core-js) from 2.6.9 to 2.6.10.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/compare/v2.6.9...v2.6.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-14 04:35:43 +00:00
dependabot-preview[bot]
c2e8a9736a
build(deps): bump @nuxtjs/apollo in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc14 to 4.0.0-rc15.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.14...v4.0.0-rc.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-14 04:34:37 +00:00
Wolfgang Huß
39b58a936e
Merge pull request #1885 from Human-Connection/1874-fix 
Fix translation error in login page
 2019-10-13 08:45:22 +02:00
Janeth
a8a4d837eb Fix translation error in login page 2019-10-13 09:22:26 +05:30
aonomike
0fe94a5d82 Complete refactor rewards spec 
- Refactor unreward path
- refactor to use variables constant
 2019-10-12 17:39:29 +03:00
aonomike
dcb40c2c33 refactor moderator user path 2019-10-12 17:00:36 +03:00
aonomike
bd83482465 Complete refactor of logged in administrator spec path 2019-10-12 16:50:58 +03:00
aonomike
b87f2a52cf Refactor rewards spec 
- Refactor unauthorised path
 2019-10-12 15:04:43 +03:00
Alexander Friedland
a04c4d9476
Merge pull request #1862 from Human-Connection/yarn_resolutions 
fix: security vulnerability with yarn resolutions
 2019-10-12 07:58:55 +02:00
mattwr18
8c1d46854d
Merge pull request #1877 from Human-Connection/fix-dockerfile-embeds 
Fix embeds settings page
 2019-10-11 16:17:10 +02:00
mattwr18
b0e7ef34ed Update findProviders.json path 2019-10-11 15:22:59 +02:00
mattwr18
dab05d9e67 Fix embeds settings page 
- Dockerfile was not copying providers.json
- Fix file path to providers.json
- Update template to show message based on allowEmbedIframes

Co-authored-by: Robert Schäfer <git@roschaefer.de>
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-10-11 14:01:39 +02:00
mattwr18
64bcff36c0
Merge pull request #1860 from Human-Connection/update-version-to-0.1.4 
update version to 0.1.4
 2019-10-11 10:54:01 +02:00
mattwr18
1cf3295e0b update version to 0.1.4 2019-10-11 10:19:46 +02:00
mattwr18
596b8de615
Merge pull request #1805 from Human-Connection/1754-fix-buggy-profile-page-posts-duplicates 
Update profile posts apollo query
 2019-10-11 10:05:21 +02:00
dependabot-preview[bot]
faca2fdce0
build(deps): bump @sentry/node from 5.6.2 to 5.7.0 in /backend 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.6.2 to 5.7.0.
- [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.6.2...5.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-11 04:51:43 +00:00
dependabot-preview[bot]
004de24b9e
build(deps-dev): bump @vue/cli-shared-utils in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.11.0 to 3.12.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/v3.12.0/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.12.0/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-11 04:51:11 +00:00