Zergling_man/thedesk
Zergling_man/thedesk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TheDesk Usamin (18.6.3)

Browse Source
This commit is contained in:
Cutls 2019-06-23 10:57:56 +09:00
parent 59d5aa4515
commit 3d0382d279
8 changed files with 45 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/js/login/instance.js
View File

@ -90,16 +90,16 @@ var idata = {
"dtp-mstdn.jp_bbcode": "disabled",
"dtp-mstdn.jp_markdown": "disabled",
"dtp-mstdn.jp_glitch": "disabled",
"misskey.xyz": "misskey",
"misskey.xyz_name": "misskey.xyz",
"misskey.xyz_letters": "1000",
"misskey.xyz_bbcode": "disabled",
"misskey.xyz_markdown": "enabled",
"misskey.xyz_public": "Global",
"misskey.xyz_post": "Post",
"misskey.xyz_fav": " reacted your post.",
"misskey.xyz_bt": " reposted your post.",
"misskey.dev": "misskey",
"misskey.io": "misskey",
"misskey.io_name": "misskey.io",
"misskey.io_letters": "1000",
"misskey.io_bbcode": "disabled",
"misskey.io_markdown": "enabled",
"misskey.io_public": "Global",
"misskey.io_post": "Post",
"misskey.io_fav": " reacted your post.",
"misskey.io_bt": " reposted your post.",
"misskey.dev": "misskey.dev",
"misskey.dev_name": "misskey.dev",
"misskey.dev_letters": "1024",
"misskey.dev_bbcode": "disabled",

4
app/js/tl/parse.js
View File

@ -432,6 +432,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
viashow = "hide";
} else {
var via = escapeHTML(toot.application.name);
if (empCli) {
//強調チェック
Object.keys(empCli).forEach(function (key6) {
var empCliList = empCli[key6];
@ -439,6 +440,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
boostback = "emphasized";
}
});
}
if (muteCli) {
//ミュートチェック
Object.keys(muteCli).forEach(function (key7) {
var muteCliList = muteCli[key7];
@ -447,6 +450,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
}
});
}
}
if (mix == "pinned") {
boostback = "emphasized";
}

2
app/package.json
View File

@ -1,6 +1,6 @@
{
"name": "thedesk",
"version": "18.6.2",
"version": "18.6.3",
"description": "TheDesk is a Mastodon client for PC.",
"repository": "https://github.com/cutls/TheDesk",
"main": "main.js",

6
app/view/en/index.html
View File

@ -37,7 +37,7 @@
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
<script>
var ver = "Usamin (18.6.2)";
var ver = "Usamin (18.6.3)";
//betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta";
@ -677,11 +677,13 @@
<a href="https://thedesk.top" target="_blank">HP</a><br>
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
<br>
<div id="release-Usamin_18-6-2" class="release-do" style="display:none; ">
<div id="release-Usamin_18-6-3" class="release-do" style="display:none; ">
<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note Usamin (18.6.3)</h5>
・タイムラインが表示できないバグを修正<br>
<h5>Release Note Usamin (18.6.2)</h5>
・Mastodon/Misskeyの音声ファイル添付に対応<br>
・TLを下に読めない不具合の修正<br>

6
app/view/ja/index.html
View File

@ -37,7 +37,7 @@
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
<script>
var ver = "Usamin (18.6.2)";
var ver = "Usamin (18.6.3)";
//betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta";
@ -677,11 +677,13 @@
<a href="https://thedesk.top" target="_blank">HP</a><br>
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
<br>
<div id="release-Usamin_18-6-2" class="release-do" style="display:none; ">
<div id="release-Usamin_18-6-3" class="release-do" style="display:none; ">
<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note Usamin (18.6.3)</h5>
・タイムラインが表示できないバグを修正<br>
<h5>Release Note Usamin (18.6.2)</h5>
・Mastodon/Misskeyの音声ファイル添付に対応<br>
・TLを下に読めない不具合の修正<br>

4
app/view/make/index.sample.html
View File

@ -677,11 +677,13 @@
<a href="https://thedesk.top" target="_blank">HP</a><br>
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
<br>
<div id="release-Usamin_18-6-2" class="release-do" style="display:none; ">
<div id="release-Usamin_18-6-3" class="release-do" style="display:none; ">
<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note Usamin (18.6.3)</h5>
・タイムラインが表示できないバグを修正<br>
<h5>Release Note Usamin (18.6.2)</h5>
・Mastodon/Misskeyの音声ファイル添付に対応<br>
・TLを下に読めない不具合の修正<br>

2
app/view/make/make.js
View File

@ -2,7 +2,7 @@ const fs = require("fs")
const readlineSync = require('readline-sync');
let ver = readlineSync.question('version string (empty: default string)? ');
if (!ver) {
ver = "Usamin (18.6.2)"
ver = "Usamin (18.6.3)"
}
console.log("Constructing view files " + ver + ": make sure to update package.json")
const langs = ["ja", "en", "ps"]

6
app/view/ps/index.html
View File

@ -37,7 +37,7 @@
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
<script>
var ver = "Usamin (18.6.2)";
var ver = "Usamin (18.6.3)";
//betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta";
@ -677,11 +677,13 @@
<a href="https://thedesk.top" target="_blank">HP</a><br>
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
<br>
<div id="release-Usamin_18-6-2" class="release-do" style="display:none; ">
<div id="release-Usamin_18-6-3" class="release-do" style="display:none; ">
<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note Usamin (18.6.3)</h5>
・タイムラインが表示できないバグを修正<br>
<h5>Release Note Usamin (18.6.2)</h5>
・Mastodon/Misskeyの音声ファイル添付に対応<br>
・TLを下に読めない不具合の修正<br>