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

Merge branch 'master' of https://github.com/cutls/TheDesk

Browse Source
This commit is contained in:
Cutls 2019-10-05 02:44:57 +09:00
commit c4e06f90f8
32 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/package.json
View File

@ -54,11 +54,11 @@
"jimp": "^0.8.4", "jimp": "^0.8.4",
"jquery": "^3.4.1", "jquery": "^3.4.1",
"jquery-ui-dist": "^1.12.1", "jquery-ui-dist": "^1.12.1",
"json5": "^2.1.0", "json5": "^2.1.1",
"materialize-css": "^1.0.0", "materialize-css": "^1.0.0",
"node-notifier": "^6.0.0", "node-notifier": "^6.0.0",
"sumchecker": "^3.0.0", "sumchecker": "^3.0.0",
"sweetalert2": "^8.17.6", "sweetalert2": "^8.18.0",
"vue": "^2.6.10" "vue": "^2.6.10"
}, },
"optionalDependencies": { "optionalDependencies": {
@ -66,7 +66,7 @@
"itunes-nowplaying-mac": "kPherox/itunes-nowplaying-mac#get-artworks-base64" "itunes-nowplaying-mac": "kPherox/itunes-nowplaying-mac#get-artworks-base64"
}, },
"devDependencies": { "devDependencies": {
"electron": "^6.0.10", "electron": "^6.0.11",
"electron-builder": "^21.1.5", "electron-builder": "^21.1.5",
"electron-rebuild": "^1.8.6", "electron-rebuild": "^1.8.6",
"readline-sync": "1.4.10" "readline-sync": "1.4.10"

1
app/view/make/language/af-ZA/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/ar-SA/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/bg-BG/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "Хората, които го подсилиха", "btedPeople": "Хората, които го подсилиха",
"useOtherAcct1": "Използване на друг профил", "useOtherAcct1": "Използване на друг профил",
"useOtherAcct2": ":unfav и unBT са деактивирани.", "useOtherAcct2": ":unfav и unBT са деактивирани.",
"btWithVis": "Boost with visibility",
"reply": "Отговор", "reply": "Отговор",
"bt": "Подсилване", "bt": "Подсилване",
"favRegist": "Любими", "favRegist": "Любими",

1
app/view/make/language/ca-ES/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/cs-CZ/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Použít jiný účet", "useOtherAcct1": "Použít jiný účet",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Odpovědět", "reply": "Odpovědět",
"bt": "Boostnout", "bt": "Boostnout",
"favRegist": "Oblíbit", "favRegist": "Oblíbit",

1
app/view/make/language/da-DK/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/de-DE/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "Leute, die es verstärkt haben", "btedPeople": "Leute, die es verstärkt haben",
"useOtherAcct1": "Anderes Konto verwenden", "useOtherAcct1": "Anderes Konto verwenden",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Antworten", "reply": "Antworten",
"bt": "Verstärkung", "bt": "Verstärkung",
"favRegist": "Favoriten", "favRegist": "Favoriten",

1
app/view/make/language/el-GR/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/en-US/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "crwdns3178:0crwdne3178:0", "btedPeople": "crwdns3178:0crwdne3178:0",
"useOtherAcct1": "crwdns3180:0crwdne3180:0", "useOtherAcct1": "crwdns3180:0crwdne3180:0",
"useOtherAcct2": "crwdns3182:0crwdne3182:0", "useOtherAcct2": "crwdns3182:0crwdne3182:0",
"btWithVis": "crwdns4324:0crwdne4324:0",
"reply": "crwdns3184:0crwdne3184:0", "reply": "crwdns3184:0crwdne3184:0",
"bt": "crwdns3186:0crwdne3186:0", "bt": "crwdns3186:0crwdne3186:0",
"favRegist": "crwdns3188:0crwdne3188:0", "favRegist": "crwdns3188:0crwdne3188:0",

1
app/view/make/language/es-AR/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "Gente que lo retooteó", "btedPeople": "Gente que lo retooteó",
"useOtherAcct1": "Usar otra cuenta", "useOtherAcct1": "Usar otra cuenta",
"useOtherAcct2": ":Dejar de marcar como favorito y deshacer retoot están deshabilitados.", "useOtherAcct2": ":Dejar de marcar como favorito y deshacer retoot están deshabilitados.",
"btWithVis": "Boost with visibility",
"reply": "Responder", "reply": "Responder",
"bt": "Retootear", "bt": "Retootear",
"favRegist": "Marcar como favorito", "favRegist": "Marcar como favorito",

1
app/view/make/language/es-ES/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/fi-FI/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/fr-FR/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/he-IL/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/hu-HU/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/it-IT/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/nl-NL/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/no-NO/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/pl-PL/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/pt-BR/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/pt-PT/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/ro-RO/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/ru-RU/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/sr-SP/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/sv-SE/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/tr-TR/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/uk-UA/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/vi-VN/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/zh-CN/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

1
app/view/make/language/zh-TW/index.json
View File

@ -62,6 +62,7 @@
"btedPeople": "People who boosted it", "btedPeople": "People who boosted it",
"useOtherAcct1": "Use other account", "useOtherAcct1": "Use other account",
"useOtherAcct2": ":unfav and unBT are disabled.", "useOtherAcct2": ":unfav and unBT are disabled.",
"btWithVis": "Boost with visibility",
"reply": "Reply", "reply": "Reply",
"bt": "Boost", "bt": "Boost",
"favRegist": "Favourite", "favRegist": "Favourite",

24
app/yarn.lock
View File

@ -932,10 +932,10 @@ electron-rebuild@^1.8.6:
spawn-rx "^3.0.0" spawn-rx "^3.0.0"
yargs "^13.2.4" yargs "^13.2.4"
electron@^6.0.10: electron@^6.0.11:
version "6.0.10" version "6.0.11"
resolved "https://registry.yarnpkg.com/electron/-/electron-6.0.10.tgz#3468547640c98ed46060711ca70f43d0b2e40818" resolved "https://registry.yarnpkg.com/electron/-/electron-6.0.11.tgz#64effa71397045779a1ddbf51312a41ccf26f491"
integrity sha512-eTFm6uTn7NKZE1OtSZSOxNuOrCXXeUR0U3vdF3R00byB7mrNe5AOaXEDDMwtzRGGY1jMuUX9Z7RvgXaCXRYSmw== integrity sha512-mi1oHmeFIQrg+CDQ6lbugZAloOxuWPm/ecEKYe1230PGlDoWND7SYStiWQ2eI4YXAEOL/NvuY88ogemu1qhdBg==
dependencies: dependencies:
"@types/node" "^10.12.18" "@types/node" "^10.12.18"
electron-download "^4.1.0" electron-download "^4.1.0"
@ -1580,10 +1580,10 @@ json-stringify-safe@~5.0.1:
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
json5@^2.1.0: json5@^2.1.0, json5@^2.1.1:
version "2.1.0" version "2.1.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850" resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz#81b6cb04e9ba496f1c7005d07b4368a2638f90b6"
integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ== integrity sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==
dependencies: dependencies:
minimist "^1.2.0" minimist "^1.2.0"
@ -2700,10 +2700,10 @@ supports-color@^5.3.0:
dependencies: dependencies:
has-flag "^3.0.0" has-flag "^3.0.0"
sweetalert2@^8.17.6: sweetalert2@^8.18.0:
version "8.17.6" version "8.18.0"
resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-8.17.6.tgz#80ae892cced06cfb03e6152bfa78e238c24db9be" resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-8.18.0.tgz#e8536aa0b1a1474ef36e5350ff4ae0cf473478b3"
integrity sha512-5V/zlNr/WXOW+Hmu2Sn0tCzd2+FvjVZv99i0gNYN7dk31VSPYM9mNuF5QUz5OVq49yYMpOV+F2Qslup8nnm4MQ== integrity sha512-t8r4oIisUd/fPsd4/YKuiWTKnrxZsolUVk/w7nGhMu5MKsuGh6J5sQ9Jtio+5xKg/w5QOJpH8TUhb5INuVo/YQ==
tar@^4.4.8: tar@^4.4.8:
version "4.4.11" version "4.4.11"