From 589945a1a47ed1bc0bdc087c962335583a26ac3d Mon Sep 17 00:00:00 2001 From: cutls Date: Sun, 8 Apr 2018 23:17:33 +0900 Subject: [PATCH] TheDesk Mizuki (ver.5) --- LATEST.md | 20 ++--- app/index.html | 7 +- app/js/login/login.js | 7 +- app/js/platform/end.js | 8 +- app/js/post/bb-md.js | 6 +- app/js/post/emoji.js | 2 +- app/js/post/secure.js | 3 + app/js/post/suggest.js | 21 +++++- app/js/tl/card.js | 7 ++ app/js/tl/datails.js | 8 +- app/main.js | 12 +-- app/oss.html | 166 +++++++++++++++++++++++++++++++++++++++++ app/package.json | 2 +- app/setting.html | 5 +- app/update.html | 4 +- ver.json | 2 +- 16 files changed, 246 insertions(+), 34 deletions(-) create mode 100644 app/oss.html diff --git a/LATEST.md b/LATEST.md index 3ffc8f93..0e3839f2 100644 --- a/LATEST.md +++ b/LATEST.md @@ -1,22 +1,18 @@ ## For Astarte(kirishima.cloud), My Primary Instance -TheDesk :thedesk: Mizuki (ver.4) -・カラムヘッダーにの色変更(21色+デフォルト) -・画像読み込み進捗表示 -・引用トゥートボタン -・トゥート詳細をブラウザで開くボタン -・トゥート内のトゥートへのリンクをTheDesk内で開く +TheDesk :thedesk: Mizuki (ver.5) +・アップデータを改良 +・トゥートリンクを踏んだときの利用アカウントについて改良 +・板橋丼サポート(限定公開もサポート) ほか https://thedesk.top :github: https://github.com/cutls/TheDesk #Desk #DeskUpdate ## For Vanilla Instances - Windows/LinuxクライアントTheDesk Mizuki (ver.4)リリース -・カラムヘッダーにの色変更(21色+デフォルト) -・画像読み込み進捗表示 -・引用トゥートボタン -・トゥート詳細をブラウザで開くボタン -・トゥート内のトゥートへのリンクをTheDesk内で開く +PCクライアントTheDesk :thedesk: Mizuki (ver.5) +・アップデータを改良 +・トゥートリンクを踏んだときの利用アカウントについて改良 +・板橋丼サポート(限定公開もサポート) TheDeskはマルチカラム，マルチアカウントはもちろんのこと，なにかとマストドンライフをシンプルに効率化するクライアントです。 https://thedesk.top \ No newline at end of file diff --git a/app/index.html b/app/index.html index 31ed0f28..367b55e6 100644 --- a/app/index.html +++ b/app/index.html @@ -26,7 +26,7 @@ + + +undo戻る +TheDeskのライセンスについてはTheDesk LICENSE (Latest Ver.)を参照。
+
+
Electron
+electron/electron
+Copyright (c) 2013-2018 GitHub Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions:
+
+The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. +
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ +
electron-dl
+sindresorhus/electron-dl
+MIT License
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR +THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ +
Jimp
+oliver-moran/jimp
+The MIT License (MIT)
+
+Copyright (c) 2014 Oliver Moran
+
+Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.
+ +
EmojiOne
+emojione/emojione
+
EmojiOne Artwork
+ +
EmojiOne Non-Artwork
+ + +
Font Awesome
+FortAwesome/Font-Awesome
+Font Awesome Free License
+-------------------------
+
+Font Awesome Free is free, open source, and GPL friendly. You can use it for +commercial projects, open source projects, or really almost whatever you want. +Full Font Awesome Free license: https://fontawesome.com/license.
+
+# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)
+In the Font Awesome Free download, the CC BY 4.0 license applies to all icons +packaged as SVG and JS file types.
+
+# Fonts: SIL OFL 1.1 License (https://scripts.sil.org/OFL)
+In the Font Awesome Free download, the SIL OLF license applies to all icons +packaged as web and desktop font files.
+
+# Code: MIT License (https://opensource.org/licenses/MIT)
+In the Font Awesome Free download, the MIT license applies to all non-font and +non-icon files.
+
+# Attribution
+Attribution is required by MIT, SIL OLF, and CC BY licenses. Downloaded Font +Awesome Free files already contain embedded comments with sufficient +attribution, so you shouldn't need to do anything additional when using these +files normally.
+
+We've kept attribution comments terse, so we ask that you do not actively work +to remove them from files, especially code. They're a great way for folks to +learn about Font Awesome.
+
+# Brand Icons
+All brand icons are trademarks of their respective owners. The use of these +trademarks does not indicate endorsement of the trademark holder by Font +Awesome, nor vice versa. **Please do not use brand logos for any purpose except +to represent the company, product, or service to which they refer.**
+ +
node-notifier
+mikaelbr/node-notifier
+MIT License
+
+Copyright (c) 2017 Mikael Brevik
+
+Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.
+
Google Fonts
+ + +
+undo戻る + + + \ No newline at end of file diff --git a/app/package.json b/app/package.json index deb0404e..ad76aeb5 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "TheDesk", - "version": "14.3.1", + "version": "14.5.0", "description": "TheDesk on Mastodonはシンプルと多機能を両立したデスクトップ向けクライアントです", "main": "main.js", "scripts": { diff --git a/app/setting.html b/app/setting.html index 5e184da2..0e248923 100644 --- a/app/setting.html +++ b/app/setting.html @@ -74,14 +74,14 @@
-
非表示設定の画像を隠す
きつめのぼかしがかかります。 +
非表示設定の画像(NSFW)を隠す
きつめのぼかしがかかります。

-
非表示設定のテキストを隠す
+
非表示設定のテキスト(CW)を隠す
@@ -258,6 +258,7 @@
寿司を投げる
Osushi.love
+OSS License(オープンソースライセンス)
Copyright © TheDesk on Mastodon 2018 & Cutls.com 2015 All Rights Reserved. TheDesk LICENSE (Latest Ver.)
Developer: Cutls P( diff --git a/app/update.html b/app/update.html index 6e3636f6..5062c27b 100644 --- a/app/update.html +++ b/app/update.html @@ -50,9 +50,11 @@ verck(); } ipc.on('prog', function (event, arg) { console.log(arg); - $(".determinate").css('width',arg*100+"%"); + $(".determinate").css('width',arg*100+"%"); + $("#prog").text("ダウンロード中:"+Math.floor(arg*100)+"%"); }) ipc.on('mess', function (event, arg) { + console.log(arg); $("#prog").text(arg); }) function verck(){ diff --git a/ver.json b/ver.json index 355d1758..51de19f1 100644 --- a/ver.json +++ b/ver.json @@ -1 +1 @@ -{"warn":"これはGCPにアップして下さい！！","warn2":"これはGCPにアップして下さい！！","warn3":"これはGCPにアップして下さい！！","desk":"Mizuki (ver.3[fixed])","date":"2018-04-07","detail":"内部V:14.4.0|・カラムヘッダーの色変更・引用トゥートボタンほか"} \ No newline at end of file +{"warn":"これはGCPにアップして下さい！！","warn2":"これはGCPにアップして下さい！！","warn3":"これはGCPにアップして下さい！！","desk":"Mizuki (ver.5)","date":"2018-04-08","detail":"内部V:14.5.0|ダウンローダー修正/絵文字サジェスト/トゥートリンク修正/板橋丼サポート"} \ No newline at end of file