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

6248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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]
b8112b021a
build(deps): bump apollo-server-express from 2.9.5 to 2.9.6 in /backend 
Bumps [apollo-server-express](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-express@2.9.5...apollo-server-express@2.9.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-11 04:50:18 +00:00
dependabot-preview[bot]
c4adb5d5fe
build(deps-dev): bump @babel/core from 7.6.2 to 7.6.4 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.6.2 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.2...v7.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-11 04:49:43 +00:00
roschaefer
c1a696577b fix: search for email case-insensitively 2019-10-11 02:40:48 +02:00
mattwr18
af7b52e212
Merge pull request #1859 from Human-Connection/roschaefer-patch-1 
Add Hall of Fame to README
 2019-10-11 01:28:05 +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
0e6e8f4e01 fix: security vulnerability with yarn resolutions 2019-10-11 00:58:26 +02:00
roschaefer
afe189435a Allow public registration by default on docker env 
My thought here is that a mailserver is started in
`docker-compose.override.yml` so you can see the emails being sent.
 2019-10-11 00:54:19 +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
c8c0414564 fix: send nonce along with signup mail 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