161sh/trashposs
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/trashposs synced 2024-11-22 08:53:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/syuilo/misskey

Browse Source
This commit is contained in:
syuilo 2017-12-14 12:43:42 +09:00
commit 660d7d529c
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/config.md
View File

@ -49,4 +49,12 @@ sw:
# VAPIDの秘密鍵 # VAPIDの秘密鍵
private_key: private_key:
# Twitterインテグレーションの設定(利用しない場合は省略可能)
twitter:
# インテグレーション用アプリのコンシューマーキー
consumer_key:
# インテグレーション用アプリのコンシューマーシークレット
consumer_secret:
``` ```

6
package.json
View File

@ -59,12 +59,12 @@
"@types/morgan": "1.7.35", "@types/morgan": "1.7.35",
"@types/ms": "0.7.30", "@types/ms": "0.7.30",
"@types/multer": "1.3.6", "@types/multer": "1.3.6",
"@types/node": "8.0.58", "@types/node": "8.5.0",
"@types/page": "1.5.32", "@types/page": "1.5.32",
"@types/proxy-addr": "2.0.0", "@types/proxy-addr": "2.0.0",
"@types/qrcode": "0.8.0", "@types/qrcode": "0.8.0",
"@types/ratelimiter": "2.1.28", "@types/ratelimiter": "2.1.28",
"@types/redis": "2.8.2", "@types/redis": "2.8.3",
"@types/request": "2.0.9", "@types/request": "2.0.9",
"@types/rimraf": "2.0.2", "@types/rimraf": "2.0.2",
"@types/riot": "3.6.1", "@types/riot": "3.6.1",
@ -165,7 +165,7 @@
"tslint": "5.8.0", "tslint": "5.8.0",
"typescript": "2.6.2", "typescript": "2.6.2",
"uglify-es": "3.2.0", "uglify-es": "3.2.0",
"uglifyjs-webpack-plugin": "1.1.2", "uglifyjs-webpack-plugin": "1.1.3",
"uuid": "3.1.0", "uuid": "3.1.0",
"vhost": "3.0.2", "vhost": "3.0.2",
"web-push": "3.2.5", "web-push": "3.2.5",

2
src/web/app/mobile/tags/post-form.tag
View File

@ -12,7 +12,7 @@
<div class="attaches" show={ files.length != 0 }> <div class="attaches" show={ files.length != 0 }>
<ul class="files" ref="attaches"> <ul class="files" ref="attaches">
<li class="file" each={ files } data-id={ id }> <li class="file" each={ files } data-id={ id }>
<div class="img" style="background-image: url({ url + '?thumbnail&size=64' })" title={ name } onclick={ removeFile }></div> <div class="img" style="background-image: url({ url + '?thumbnail&size=128' })" onclick={ removeFile }></div>
</li> </li>
</ul> </ul>
</div> </div>