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

2020 Commits

Author SHA1 Message Date
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
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
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
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
Wolfgang Huß
fd27583c1d Merge branch '1707-reporting-with-specific-information' of github.com:Human-Connection/Human-Connection into 1707-refactor-db-reporting-with-specific-information 
# Conflicts:
#	shared/moderation/report.js
 2019-10-14 16:21:08 +02:00
Wolfgang Huß
f7cff9cd0b Delete shared file, because it doesn't work with jest tests 2019-10-14 16:18:26 +02:00
Wolfgang Huß
c7849cedd8 Rename report reason category names to have '_' instead '-' 2019-10-14 16:12:21 +02:00
Wolfgang Huß
ddb9a63f6e Merge branch '1707-reporting-with-specific-information' of github.com:Human-Connection/Human-Connection into 1707-refactor-db-reporting-with-specific-information 2019-10-14 15:35:22 +02:00
Wolfgang Huß
2cf2f2b011 Import report reason categories from a shared array 2019-10-14 15:20:51 +02:00
Wolfgang Huß
663cfeb0b2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-14 13:37:58 +02:00
Wolfgang Huß
8bc939c2da Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-refactor-db-reporting-with-specific-information 2019-10-14 13:36:24 +02: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
Janeth
a8a4d837eb Fix translation error in login page 2019-10-13 09:22:26 +05:30
Wolfgang Huß
1c8385120c Add date-time to the moderators report list 2019-10-11 16:36:37 +02:00
Wolfgang Huß
82228c6c99 Refactored backend database to a single REPORTED relation 2019-10-11 16:35:15 +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
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
Wolfgang Huß
94c7d73019 Merge branch '1707-reporting-with-specific-information' of github.com:Human-Connection/Human-Connection into 1707-refactor-db-reporting-with-specific-information 2019-10-11 08:17:15 +02:00
Wolfgang Huß
2a034ee74f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 
# Conflicts:
#	webapp/locales/de.json
 2019-10-11 08:16:00 +02: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
roschaefer
c1a696577b fix: search for email case-insensitively 2019-10-11 02:40:48 +02:00
mattwr18
7430fdffa9
Merge pull request #1814 from Human-Connection/1785-register_as_new_user 
Implement public registration
 2019-10-11 01:25:44 +02:00
roschaefer
01252b3584 refactor: follow @mattwr18 code review 
https://github.com/Human-Connection/Human-Connection/pull/1814#pullrequestreview-299434476
 2019-10-11 00:54:19 +02:00
roschaefer
adec248b18 fix: compare env var with value to avoid type err 2019-10-11 00:54:19 +02:00
roschaefer
8305921f00 Fine tune layout and spacing 2019-10-11 00:54:19 +02:00
mattwr18
bc4acf939f Fix lint 2019-10-11 00:54:19 +02:00
roschaefer
a2c9ed520d fix: frontend tests 2019-10-11 00:54:19 +02:00
roschaefer
9ac1e333d6 feat: implement public registration checks 2019-10-11 00:54:19 +02:00
roschaefer
b1e01cb65a refactor: better errors, introduce email constants 2019-10-11 00:54:19 +02:00