IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-14 00:44:52 +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
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
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ß
6365d3df54 Implement enum for report reason categories after Matts suggestion 2019-10-14 15:53:36 +02:00
aonomike
47a2a21fc0 Resolve review comments 2019-10-14 16:46:37 +03:00
Wolfgang Huß
19facb22a9 Merge branch '1707-refactor-db-reporting-with-specific-information' of github.com:Human-Connection/Human-Connection into 1707-refactor-db-reporting-with-specific-information 2019-10-14 15:37:29 +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ß
3c472293ac
Update backend/src/schema/resolvers/reports.spec.js 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-10-14 15:22:25 +02:00
Wolfgang Huß
b50896bb45
Update backend/src/schema/resolvers/reports.spec.js 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-10-14 15:22:07 +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
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
Kapil Jain
0da37d6af8 updated shout resolver to add createdAt 2019-10-11 15:52:35 -04:00
Wolfgang Huß
d5e1a67e0c Manipulate database to replace report node with direct REPORTED relation 2019-10-11 17:33:04 +02:00
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
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
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]
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
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