mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-12-19 17:18:12 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
syuilo 2019-04-24 20:51:34 +09:00
commit 6ff5157276
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -35,6 +35,11 @@ mongodb:
8. master ブランチに戻す 8. master ブランチに戻す
9. enjoy 9. enjoy
11.3.1 (2019/04/24)
-------------------
### Fixes
* Webからファイルがアップロードできない問題を修正
11.3.0 (2019/04/24) 11.3.0 (2019/04/24)
------------------- -------------------
### Improvements ### Improvements

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "misskey", "name": "misskey",
"author": "syuilo <i@syuilo.com>", "author": "syuilo <i@syuilo.com>",
"version": "11.3.0", "version": "11.3.1",
"codename": "daybreak", "codename": "daybreak",
"repository": { "repository": {
"type": "git", "type": "git",

4
src/client/app/common/views/components/uploader.vue
View File

@ -38,10 +38,10 @@ export default Vue.extend({
const data = new FormData(); const data = new FormData();
data.append('md5', getMD5(fileData)); data.append('md5', getMD5(fileData));
this.$root.api('drive/files/check_existence', { this.$root.api('drive/files/find-by-hash', {
md5: getMD5(fileData) md5: getMD5(fileData)
}).then(resp => { }).then(resp => {
resolve(resp.file); resolve(resp.length > 0 ? resp[0] : null);
}); });
}); });
}, },

2
src/client/app/desktop/views/components/post-form.vue
View File

@ -228,7 +228,7 @@ export default Vue.extend({
const draft = JSON.parse(localStorage.getItem('drafts') || '{}')[this.draftId]; const draft = JSON.parse(localStorage.getItem('drafts') || '{}')[this.draftId];
if (draft) { if (draft) {
this.text = draft.data.text; this.text = draft.data.text;
this.files = draft.data.files; this.files = (draft.data.files || []).filter(e => e);
if (draft.data.poll) { if (draft.data.poll) {
this.poll = true; this.poll = true;
this.$nextTick(() => { this.$nextTick(() => {