ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1924-moderators-reports-list-sort-desc

Browse Source
This commit is contained in:
Wolfgang Huß 2019-10-17 10:05:13 +02:00
commit 681733bb0f
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/package.json
View File

@ -54,7 +54,7 @@
"cheerio": "~1.0.0-rc.3", "cheerio": "~1.0.0-rc.3",
"cors": "~2.8.5", "cors": "~2.8.5",
"cross-env": "~6.0.3", "cross-env": "~6.0.3",
"date-fns": "2.4.1", "date-fns": "2.5.0",
"debug": "~4.1.1", "debug": "~4.1.1",
"dotenv": "~8.2.0", "dotenv": "~8.2.0",
"express": "^4.17.1", "express": "^4.17.1",

8
backend/yarn.lock
View File

@ -2782,10 +2782,10 @@ data-urls@^1.0.0:
whatwg-mimetype "^2.2.0" whatwg-mimetype "^2.2.0"
whatwg-url "^7.0.0" whatwg-url "^7.0.0"
date-fns@2.4.1: date-fns@2.5.0:
version "2.4.1" version "2.5.0"
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.4.1.tgz#b53f9bb65ae6bd9239437035710e01cf383b625e" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.5.0.tgz#b939f17c2902ce81cffe449702ba22c0781b38ec"
integrity sha512-2RhmH/sjDSCYW2F3ZQxOUx/I7PvzXpi89aQL2d3OAxSTwLx6NilATeUbe0menFE3Lu5lFkOFci36ivimwYHHxw== integrity sha512-I6Tkis01//nRcmvMQw/MRE1HAtcuA5Ie6jGPb8bJZJub7494LGOObqkV3ParnsSVviAjk5C8mNKDqYVBzCopWg==
debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
version "2.6.9" version "2.6.9"

2
styleguide

@ -1 +1 @@
Subproject commit 808b3c5a9523505cb80b20b50348d29ba9932845 Subproject commit d46fc1570c6bcea328ae4cc3a4892745edea7319

5
webapp/components/TeaserImage/TeaserImage.vue
View File

@ -100,8 +100,9 @@ export default {
thumbnailElement.appendChild(image) thumbnailElement.appendChild(image)
// Remove the editor from view // Remove the editor from view
editor.parentNode.removeChild(editor) editor.parentNode.removeChild(editor)
this.$emit('addTeaserImage', blob) const croppedImageFile = new File([blob], file.name, { type: 'image/jpeg' })
}) this.$emit('addTeaserImage', croppedImageFile)
}, 'image/jpeg')
}) })
editor.appendChild(confirm) editor.appendChild(confirm)

2
webapp/package.json
View File

@ -65,7 +65,7 @@
"cookie-universal-nuxt": "~2.0.18", "cookie-universal-nuxt": "~2.0.18",
"cropperjs": "^1.5.5", "cropperjs": "^1.5.5",
"cross-env": "~6.0.3", "cross-env": "~6.0.3",
"date-fns": "2.4.1", "date-fns": "2.5.0",
"express": "~4.17.1", "express": "~4.17.1",
"graphql": "~14.5.8", "graphql": "~14.5.8",
"isemail": "^3.2.0", "isemail": "^3.2.0",

8
webapp/yarn.lock
View File

@ -6053,10 +6053,10 @@ data-urls@^1.0.0:
whatwg-mimetype "^2.2.0" whatwg-mimetype "^2.2.0"
whatwg-url "^7.0.0" whatwg-url "^7.0.0"
date-fns@2.4.1: date-fns@2.5.0:
version "2.4.1" version "2.5.0"
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.4.1.tgz#b53f9bb65ae6bd9239437035710e01cf383b625e" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.5.0.tgz#b939f17c2902ce81cffe449702ba22c0781b38ec"
integrity sha512-2RhmH/sjDSCYW2F3ZQxOUx/I7PvzXpi89aQL2d3OAxSTwLx6NilATeUbe0menFE3Lu5lFkOFci36ivimwYHHxw== integrity sha512-I6Tkis01//nRcmvMQw/MRE1HAtcuA5Ie6jGPb8bJZJub7494LGOObqkV3ParnsSVviAjk5C8mNKDqYVBzCopWg==
date-fns@^1.27.2: date-fns@^1.27.2:
version "1.30.1" version "1.30.1"