diff --git a/TOS.md b/TOS.md new file mode 100644 index 00000000..e69de29b diff --git a/app/img/kyash.png b/app/img/kyash.png new file mode 100644 index 00000000..81a52acf Binary files /dev/null and b/app/img/kyash.png differ diff --git a/app/js/tl/card.js b/app/js/tl/card.js index 7f80141a..d9db7dd9 100644 --- a/app/js/tl/card.js +++ b/app/js/tl/card.js @@ -21,7 +21,6 @@ function additional(acct_id, tlid) { }); - //トゥートサムネ $("#timeline_" + tlid + " .toot a:not(.parsed)").each(function(i, elem) { var domain = localStorage.getItem("domain_" + acct_id); diff --git a/app/package-lock.json b/app/package-lock.json index 99dd22d7..b245aca1 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,14 +1,9 @@ { "name": "thedesk", - "version": "16.1.2", + "version": "16.1.3", "lockfileVersion": 1, "requires": true, "dependencies": { - "adm-zip": { - "version": "0.4.11", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.11.tgz", - "integrity": "sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA==" - }, "ajv": { "version": "5.5.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", diff --git a/app/package.json b/app/package.json index fcd176cc..06229a2a 100644 --- a/app/package.json +++ b/app/package.json @@ -26,7 +26,6 @@ ], "license": "TheDesk LICENSE", "dependencies": { - "adm-zip": "^0.4.11", "electron-dl": "^1.11.0", "jimp": "^0.2.28", "node-notifier": "^5.2.1", diff --git a/app/view/en/index.html b/app/view/en/index.html index e479ec31..589e5876 100644 --- a/app/view/en/index.html +++ b/app/view/en/index.html @@ -555,6 +555,8 @@ var lang="en";
Give me Amazon Gift Card:mstdn@thedesk.top
+ Kyash
+
Close diff --git a/app/view/en/oss.html b/app/view/en/oss.html index a41140e0..9caf5aa0 100644 --- a/app/view/en/oss.html +++ b/app/view/en/oss.html @@ -14,8 +14,7 @@ -undo戻る/Back -TheDeskのライセンスについてはTheDesk LICENSE (Latest Ver.)を参照。
+undoBack LICENSE of TheDesk:TheDesk LICENSE (Latest Ver.)
Electron
@@ -170,39 +169,37 @@ Please visit: picture_as_pdf -
adm-zip
-cthackers/adm-zip
-Copyright (c) 2012 Another-D-Mention Software and other contributors, -http://www.another-d-mention.ro/
-
-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
+
emoji-data
+The MIT License (MIT)
+
+Copyright (c) 2013 Cal Henderson
+
+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.
-undo戻る +undoBack \ No newline at end of file diff --git a/app/view/en/setting.html b/app/view/en/setting.html index a3ca15d9..efb7c148 100644 --- a/app/view/en/setting.html +++ b/app/view/en/setting.html @@ -383,6 +383,8 @@ Developer: Cutls@kirishima.cloud Give me a sushi!
+Kyash
+
Check update
OSS License
Copyright © TheDesk 2018 All Rights Reserved. diff --git a/app/view/ja/index.html b/app/view/ja/index.html index e790717c..88e7070e 100644 --- a/app/view/ja/index.html +++ b/app/view/ja/index.html @@ -555,6 +555,8 @@ var lang="ja";
mstdn@thedesk.topにAmazonギフトカードを送る
+ Kyash
+
Close diff --git a/app/view/ja/oss.html b/app/view/ja/oss.html index a41140e0..6bf12f58 100644 --- a/app/view/ja/oss.html +++ b/app/view/ja/oss.html @@ -14,9 +14,8 @@ -undo戻る/Back +undo戻る TheDeskのライセンスについてはTheDesk LICENSE (Latest Ver.)を参照。
-LICENSE of TheDesk:TheDesk LICENSE (Latest Ver.)
Electron
electron/electron
@@ -170,37 +169,34 @@ Please visit: picture_as_pdf -
adm-zip
-cthackers/adm-zip
-Copyright (c) 2012 Another-D-Mention Software and other contributors, -http://www.another-d-mention.ro/
-
-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
- +
emoji-data
+The MIT License (MIT)
+
+Copyright (c) 2013 Cal Henderson
+
+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.
undo戻る diff --git a/app/view/ja/setting.html b/app/view/ja/setting.html index 8a661770..4fed7c9f 100644 --- a/app/view/ja/setting.html +++ b/app/view/ja/setting.html @@ -383,6 +383,8 @@ Developer: Cutls@kirishima.cloud 寿司を投げる
+Kyash
+
アップデートを確認
OSS License(オープンソースライセンス)
Copyright © TheDesk 2018 All Rights Reserved. diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index 56cab57e..6339a105 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -555,6 +555,8 @@ var lang="{{lang}}";
{{SendAmazonGift1}}mstdn@thedesk.top{{SendAmazonGift2}}
+ Kyash
+
{{close}} diff --git a/app/view/make/setting.sample.html b/app/view/make/setting.sample.html index 4bb43d9f..fc6b334c 100644 --- a/app/view/make/setting.sample.html +++ b/app/view/make/setting.sample.html @@ -383,6 +383,8 @@ Developer: Cutls@kirishima.cloud {{sushi}}
+Kyash
+
{{checkup}}
OSS License{{ossJP}}
Copyright © TheDesk 2018 All Rights Reserved.