Compare commits

...

125 Commits

Author SHA1 Message Date
Brayd 2e4acc2b4a
Rebase upstream 2023-07-05 12:10:39 +02:00
Brayd 6b97eda6f8
Update package.json 2023-07-05 12:09:34 +02:00
freeplay 892610092a remove unneeded property 2023-07-04 21:39:41 -04:00
freeplay ef3f9316a0 style: truncate long URL's 2023-07-04 21:37:50 -04:00
freeplay d06bbe7b1b fix: add back channel display in timeline 2023-07-04 13:47:31 -04:00
freeplay bd5e2c5692 style: add back scrollbar-color for firefox 2023-07-04 13:33:56 -04:00
freeplay 75cbe78387 style: accent color in plyr 2023-07-04 12:00:48 -04:00
Poesty Li 2a98894891
chore: Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (1816 of 1816 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/zh_Hans/
2023-07-04 12:29:23 +02:00
Hosted Weblate 3ec85b77e4
chore: Merge branch 'origin/develop' into Weblate. 2023-07-04 07:59:54 +02:00
Namekuji bc13416f8e
fix: do not deliver poll result if local-only 2023-07-04 01:59:43 -04:00
Namekuji 0e38baf145
fix: do not deliver poll reulst if local-only 2023-07-04 01:58:51 -04:00
Kainoa Kanter 9de97d3ebd fix: 🐛query search endpoint for local userselect, disregard host 2023-07-04 01:29:57 +00:00
Kainoa Kanter 0fa4dbf11d chore: 👥 patrons 2023-07-03 22:57:03 +00:00
freeplay bee2a245ae fix: videos not appearing when don't play animated images is one 2023-07-03 16:01:54 -04:00
ThatOneCalculator e603745f97
fix: immediately fail jobs with invalid signature 2023-07-03 10:29:52 -07:00
Hosted Weblate 53dedadc58
chore: Merge branch 'origin/develop' into Weblate. 2023-07-03 14:39:21 +02:00
Claire da299f0604
chore: Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (1816 of 1816 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/zh_Hans/
2023-07-03 14:39:13 +02:00
jolupa 9283b2d92c
chore: Translated using Weblate (Catalan)
Currently translated at 100.0% (1816 of 1816 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
2023-07-03 14:39:05 +02:00
Kainoa Kanter b94f527d9a chore: 👥 patrons 2023-07-03 09:02:14 +00:00
ThatOneCalculator 5847f95da2
chore: 👥 patrons 2023-07-02 23:37:44 -07:00
ThatOneCalculator c392697b4c
chore: 🎨 format 2023-07-02 23:08:33 -07:00
ThatOneCalculator 02a8d3283e
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-07-02 23:07:51 -07:00
ThatOneCalculator 1f3f0720f8
fix: 💄 form switch padding 2023-07-02 23:06:25 -07:00
wuhang2003 c0d1f76f6f
chore: Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (1816 of 1816 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/zh_Hans/
2023-07-03 06:52:58 +02:00
Claire 4c09522f76
chore: Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (1816 of 1816 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/zh_Hans/
2023-07-03 06:52:57 +02:00
freeplay 40cbaff74c Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream 2023-07-03 00:03:23 -04:00
freeplay b37ba33c12 feat: show alt button even when content hidden 2023-07-03 00:02:36 -04:00
freeplay ac51ce0051 refactor: combine MediaVideo & MediaImage components 2023-07-02 23:41:38 -04:00
Kainoa Kanter 2968d17bc5 Merge pull request '[PR]: perf: enforce redis with TTL to cache' (#10397) from nmkj/calckey:replace-cache into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10397
2023-07-03 03:23:19 +00:00
Namekuji 722ccf04f9
rename arg 2023-07-02 23:14:43 -04:00
Hosted Weblate a4af82c21b
chore: Merge branch 'origin/develop' into Weblate. 2023-07-03 04:33:09 +02:00
Poesty Li 3434c23ae6
chore: Translated using Weblate (Chinese (Simplified))
Currently translated at 97.4% (1769 of 1816 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/zh_Hans/
2023-07-03 04:33:09 +02:00
Namekuji af4797bb8e
throw error if failed 2023-07-02 22:25:58 -04:00
Syuilo f17c9837c5
refactor: make identicons and server metrics optional
Co-authored-by: Kainoa Kanter <kainoa@t1c.dev>
2023-07-02 19:23:55 -07:00
Namekuji 355b1e0063
no more infinity caches 2023-07-02 22:14:31 -04:00
Namekuji 76c9422d53
add cache prefix 2023-07-02 20:55:20 -04:00
Namekuji 947163fde2
store cache values to redis 2023-07-02 20:37:46 -04:00
Hosted Weblate 37f08826d1
chore: Merge branch 'origin/develop' into Weblate. 2023-07-03 01:26:30 +02:00
ThatOneCalculator a77787bd4d
Merge remote-tracking branch 'weblate/develop' into develop 2023-07-02 16:26:16 -07:00
ThatOneCalculator f37a375ec7
Merge remote-tracking branch 'weblate/develop' into develop 2023-07-02 16:25:17 -07:00
Kainoa Kanter 967c26a0a5 Merge pull request '[PR]: Render instance description in about page as HTML' (#10393) from esm/calckey:fix/about-page-html into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10393
2023-07-02 23:23:52 +00:00
Syuilo 703f28a1ab
refactor: make identicons and server metrics optional
Co-authored-by: Kainoa Kanter <kainoa@t1c.dev>
2023-07-02 16:23:11 -07:00
Hosted Weblate 7ed8f9a5e5
chore: Merge branch 'origin/develop' into Weblate. 2023-07-03 01:21:50 +02:00
Poesty Li b2932f77fa
chore: Translated using Weblate (Chinese (Simplified))
Currently translated at 96.8% (1757 of 1814 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/zh_Hans/
2023-07-03 01:21:50 +02:00
Claire 5965093326
chore: Translated using Weblate (Chinese (Simplified))
Currently translated at 96.8% (1757 of 1814 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/zh_Hans/
2023-07-03 01:21:49 +02:00
Syuilo 0cac6f018d
refactor: make identicons and server metrics optional
Co-authored-by: Kainoa Kanter <kainoa@t1c.dev>
2023-07-02 16:20:40 -07:00
Kainoa Kanter 7ab8021a9d Merge pull request '[PR]: Temp fix for null metadata' (#10390) from yawhn/trickey:fix_avatar_errors into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10390
2023-07-02 22:54:56 +00:00
Kainoa Kanter c0348add7a Merge pull request '[PR]: Embedded all attachment, renotes and discussion history into rss feed content & improve title, and not generate feed for locked account' (#10388) from cgsama/calckey:feedenhance into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10388
2023-07-02 21:50:09 +00:00
Essem a147d56ae7 Render instance description as HTML 2023-07-02 18:23:02 +00:00
ThatOneCalculator 71ca2e631e
chore: 👥 patrons 2023-07-02 10:18:36 -07:00
ThatOneCalculator 082fafe502
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-07-02 10:10:43 -07:00
ThatOneCalculator 63c193f9fc
Revert "Merge pull request '[PR]: fix: use redis-based mutex to prevent memory leak' (#10389) from nmkj/calckey:fix-cache-leak into develop"
This reverts commit 224b1d585b, reversing
changes made to b5907fb86d.
2023-07-02 10:10:25 -07:00
Kainoa Kanter b78ad937a5 Merge pull request '[PR]: Add aria labels to notification settings/mark as read buttons' (#10392) from esm/calckey:fix/notif-button-a11y into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10392
2023-07-02 17:08:37 +00:00
freeplay 567d94196a Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream 2023-07-02 13:01:54 -04:00
freeplay cd121790b9 style: visible button w/out hovering in url preview 2023-07-02 13:01:50 -04:00
Essem a41f537970
Add aria labels to notification buttons 2023-07-02 12:00:29 -05:00
Poesty Li 196eaaa580
chore: Translated using Weblate (Chinese (Simplified))
Currently translated at 94.7% (1719 of 1814 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/zh_Hans/
2023-07-02 18:55:51 +02:00
Claire 90f4ab9739
chore: Translated using Weblate (Chinese (Simplified))
Currently translated at 94.7% (1719 of 1814 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/zh_Hans/
2023-07-02 18:55:50 +02:00
Claire 5567dbb3c3
chore: Translated using Weblate (Chinese (Simplified))
Currently translated at 91.0% (1651 of 1814 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/zh_Hans/
2023-07-02 18:41:30 +02:00
Poesty Li 5ec419394d
chore: Translated using Weblate (Chinese (Simplified))
Currently translated at 91.0% (1651 of 1814 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/zh_Hans/
2023-07-02 18:41:29 +02:00
Claire ee1218b336
chore: Translated using Weblate (Chinese (Simplified))
Currently translated at 88.2% (1600 of 1814 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/zh_Hans/
2023-07-02 18:29:30 +02:00
Poesty Li f243a5ec50
chore: Translated using Weblate (Chinese (Simplified))
Currently translated at 88.2% (1600 of 1814 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/zh_Hans/
2023-07-02 18:29:28 +02:00
jolupa 57b5fcff6d
chore: Translated using Weblate (Catalan)
Currently translated at 100.0% (1814 of 1814 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
2023-07-02 18:29:24 +02:00
ThatOneCalculator cb2046efac
fix: 🐛 display emoji stat properly 2023-07-02 09:26:03 -07:00
ThatOneCalculator 73edce511f
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-07-02 08:30:25 -07:00
Kainoa Kanter 224b1d585b Merge pull request '[PR]: fix: use redis-based mutex to prevent memory leak' (#10389) from nmkj/calckey:fix-cache-leak into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10389
2023-07-02 14:43:01 +00:00
yawhn f74c968714 fix: temp fix for null metadata 2023-07-02 16:16:01 +03:00
ThatOneCalculator 5004da0ea3
adjust timeout for indexing notes 2023-07-02 00:47:55 -07:00
ThatOneCalculator d3ccd00d5e
me when codeberg 2023-07-02 00:20:14 -07:00
ThatOneCalculator 17009455da
fix: 🐛 patron timeout 2023-07-02 00:16:01 -07:00
Namekuji eee80b3ff6
set log level to debug 2023-07-02 02:03:14 -04:00
Namekuji ac2b057f85
fix: use redis-semaphore for global mutex and memory leak prevention 2023-07-02 01:47:11 -04:00
ThatOneCalculator b5907fb86d
chore: 🎨 format 2023-07-01 22:37:28 -07:00
ThatOneCalculator fe495c6118
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-07-01 22:35:45 -07:00
ThatOneCalculator 4b410194c2
fix 2023-07-01 22:35:38 -07:00
Kainoa Kanter 599fc3d7a3 Merge pull request '[PR]: fix: publication logic involving relays' (#10383) from nmkj/calckey:fix-boost-publication into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10383
2023-07-02 05:28:01 +00:00
ThatOneCalculator 9788fc0ce1
chore: 👥 patrons 2023-07-01 22:21:48 -07:00
ThatOneCalculator 0d9e50d04e
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-07-01 22:07:51 -07:00
Laura Hausmann 6c29a2ae01
Fix mastodon api conversion for new note id type 2023-07-01 22:07:08 -07:00
naskya 79765e4b19 Please let me revert this (appearNote in getWordSoftMute) for now
This reverts commit cda1c19454.
2023-07-02 04:47:11 +00:00
ThatOneCalculator b90c824f0c
fix typo 2023-07-01 21:05:38 -07:00
ThatOneCalculator 6e17c0d7ef
drive todo 2023-07-01 21:03:11 -07:00
ThatOneCalculator 097c93df3a
chore: 👥 patrons 2023-07-01 21:02:01 -07:00
CGsama ba680211ca Embedded all attachment, renotes and discussion history into rss feed content & improve title, and not generate feed for locked account 2023-07-01 23:58:36 -04:00
ThatOneCalculator 592894dbb0
feat: add emoji count to admin panel 2023-07-01 20:54:37 -07:00
ThatOneCalculator 3d8fe32ef4
chore: 🎨 format 2023-07-01 20:46:33 -07:00
ThatOneCalculator cf3c3e8234
feat: celebrate on calendar when birthday 2023-07-01 20:46:13 -07:00
ThatOneCalculator 6aae847c4d
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-07-01 20:00:58 -07:00
ThatOneCalculator d9af4f3a27
refactor: 🚩 post editing is no longer experimental 2023-07-01 20:00:51 -07:00
Hosted Weblate 6b85892c88
chore: Merge branch 'origin/develop' into Weblate. 2023-07-02 04:31:29 +02:00
Ettore Atalan eeed9159da
chore: Translated using Weblate (German)
Currently translated at 98.7% (1793 of 1815 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
2023-07-02 04:31:28 +02:00
ThatOneCalculator f2bedbd645
refactor: 🌐 patrons description 2023-07-01 19:31:05 -07:00
ThatOneCalculator 1048c1f676
chore: 👥 patrons 2023-07-01 19:17:22 -07:00
ThatOneCalculator 43561500d7
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-07-01 19:14:35 -07:00
ThatOneCalculator fc8f9f63ca
chore: 👥 patrons 2023-07-01 19:14:14 -07:00
freeplay 934a21776c fix: new posts click 2023-07-01 21:48:18 -04:00
freeplay e0581f8999 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream 2023-07-01 21:35:09 -04:00
freeplay aead731e63 fix/refactor: move new posts button to MkTimeline 2023-07-01 21:35:05 -04:00
ThatOneCalculator 0ee70ebffd
chore: 👥 patrons 2023-07-01 18:21:40 -07:00
ThatOneCalculator 7007abff46
chore: 👥 patrons 2023-07-01 18:11:21 -07:00
ThatOneCalculator ec8642bf4f
chore: 👥 patrons 2023-07-01 17:31:45 -07:00
ThatOneCalculator 3db785444a
fix: 🔊 log emoji picker errors 2023-07-01 16:59:57 -07:00
freeplay ba6502a45b Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream 2023-07-01 19:21:44 -04:00
freeplay 61ad79ec17 fix: webkit blur effects 2023-07-01 19:21:26 -04:00
Kainoa Kanter d0877c8db9 chore: 👥 patrons 2023-07-01 15:16:14 +00:00
Namekuji 49e17e776c
refactor: examine by get instead of exists 2023-07-01 04:09:04 -04:00
Kainoa Kanter 1ad356c30e chore: 👥 patrons 2023-07-01 07:57:59 +00:00
Namekuji ab789f2ca8
fix: await release 2023-07-01 03:49:44 -04:00
Namekuji 4bf1dbbd83
change mutex key 2023-07-01 03:49:43 -04:00
Namekuji 38d4d34713
refactor: use redis-semaphore for mutex across workers 2023-07-01 03:49:43 -04:00
Namekuji f53fa96fc6
refactor: no url instantiation 2023-07-01 03:49:43 -04:00
Namekuji 159f788696
fix: ignore if post boosted by relay is local 2023-07-01 03:49:42 -04:00
Namekuji 44bf99e0c1
fix: multiple boost publication by relay 2023-07-01 03:49:39 -04:00
ThatOneCalculator ee5a08efdc
chore: 🎨 format 2023-06-30 23:35:45 -07:00
ThatOneCalculator 6fbe508403
refactor: ♻️ force patrons update on about-calckey 2023-06-30 23:33:54 -07:00
ThatOneCalculator 8103dd82ec
chore: 👥 patrons 2023-06-30 23:27:41 -07:00
jolupa ec7928d478
chore: Translated using Weblate (Catalan)
Currently translated at 100.0% (1815 of 1815 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
2023-07-01 07:52:09 +02:00
freeplay 6c3e96f24b Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream 2023-06-30 18:44:42 -04:00
freeplay 6ebd2f1569 fix: misaligned new post button
I don't understand why margin-top caused that ??
2023-06-30 18:44:38 -04:00
freeplay cda1c19454 fix: soft mutes not being applied to boosts 2023-06-30 18:43:35 -04:00
Kainoa Kanter 8326804603 Merge pull request 'fix: proper expire remote user drivefile over limits at adding time' (#10382) from cgsama/calckey:cgsama-patch-1 into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10382
2023-06-30 17:15:48 +00:00
freeplay 72a54a48f7 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream 2023-06-30 03:52:52 -04:00
freeplay 326679784a feat: link previews redesign 2023-06-30 03:52:22 -04:00
cgsama 42ede2ce6a Merge branch 'develop' into cgsama-patch-1 2023-06-30 06:40:53 +00:00
cgsama 7a93c81a3f proper expire remote user drivefile over limits at adding time 2023-06-30 06:26:22 +00:00
10 changed files with 538 additions and 101 deletions

View File

@ -979,9 +979,12 @@ preventAiLearning: "AIによる学習を防止"
preventAiLearningDescription: "投稿したート、添付した画像などのコンテンツを学習の対象にしないようAIに要求します。これはnoaiフラグをHTMLレスポンスに含めることによって実現されます。"
<<<<<<< HEAD
noGraze: "ブラウザの拡張機能「Graze for Mastodon」は、Calckeyの動作を妨げるため、無効にしてください。"
<<<<<<< HEAD
=======
=======
noGraze: "ブラウザの拡張機能「Graze for Mastodon」は、Firefishの動作を妨げるため、無効にしてください。"
>>>>>>> 0cac6f018d (refactor: ⚡ make identicons and server metrics optional)
>>>>>>> 44d184ac3e6372786ad7d25236853c5ed53bf6f0
enableServerMachineStats: "サーバーのマシン情報を公開する"
enableIdenticonGeneration: "ユーザーごとのIdenticon生成を有効にする"

File diff suppressed because it is too large Load Diff

View File

@ -33,7 +33,7 @@ export async function endedPollNotification(
}
// Broadcast the poll result once it ends
await deliverQuestionUpdate(note.id);
if (!note.localOnly) await deliverQuestionUpdate(note.id);
done();
}

View File

@ -103,7 +103,11 @@ const plyrMini = ref(false);
const url =
props.raw || defaultStore.state.loadRawImages
? props.media.url
<<<<<<< HEAD
: defaultStore.state.disableShowingAnimatedImages && props.media.type.startsWith('image')
=======
: defaultStore.state.disableShowingAnimatedImages
>>>>>>> 44d184ac3e6372786ad7d25236853c5ed53bf6f0
? getStaticImageUrl(props.media.thumbnailUrl)
: props.media.thumbnailUrl;
@ -178,6 +182,8 @@ onMounted(() => {
position: relative;
background: var(--bg);
--plyr-color-main: var(--accent);
> .buttons {
display: flex;
gap: 4px;

View File

@ -128,8 +128,8 @@
</div>
</div>
</div>
<div v-if="detailedView" class="info">
<MkA class="created-at" :to="notePage(appearNote)">
<div v-if="detailedView || (appearNote.channel && !inChannel)" class="info">
<MkA v-if="detailedView" class="created-at" :to="notePage(appearNote)">
<MkTime :time="appearNote.createdAt" mode="absolute" />
</MkA>
<MkA
@ -137,7 +137,7 @@
class="channel"
:to="`/channels/${appearNote.channel.id}`"
@click.stop
><i class="ph-television ph-bold ph-lg"></i>
><i class="ph-television ph-bold"></i>
{{ appearNote.channel.name }}</MkA
>
</div>

View File

@ -23,7 +23,7 @@
</FormSplit>
</div>
<div
v-if="username != '' || host != ''"
v-if="username != ''"
class="result"
:class="{ hit: users.length > 0 }"
>
@ -54,7 +54,7 @@
<span>{{ i18n.ts.noUsers }}</span>
</div>
</div>
<div v-if="username == '' && host == ''" class="recent">
<div v-if="username == ''" class="recent">
<div class="users">
<div
v-for="user in recentUsers"
@ -100,20 +100,19 @@ const emit = defineEmits<{
}>();
let username = $ref("");
let host = $ref("");
let users: misskey.entities.UserDetailed[] = $ref([]);
let recentUsers: misskey.entities.UserDetailed[] = $ref([]);
let selected: misskey.entities.UserDetailed | null = $ref(null);
let dialogEl = $ref();
const search = () => {
if (username === "" && host === "") {
if (username === "") {
users = [];
return;
}
os.api("users/search-by-username-and-host", {
username: username,
host: null,
os.api("users/search", {
query: username,
origin: "local",
limit: 10,
detail: false,
}).then((_users) => {

View File

@ -2,8 +2,9 @@
<component
:is="self ? 'MkA' : 'a'"
ref="el"
class="ieqqeuvs _link"
class="ieqqeuvs url _link"
:[attr]="self ? props.url.substring(local.length) : props.url"
:title="self ? props.url.substring(local.length) : props.url"
:rel="rel"
:target="target"
@contextmenu.stop="() => {}"
@ -73,8 +74,12 @@ const target = self ? null : "_blank";
</script>
<style lang="scss" scoped>
.ieqqeuvs {
word-break: break-all;
.url {
white-space: nowrap;
max-width: 80%;
display: inline-block;
overflow: clip;
text-overflow: ellipsis;
> .icon {
padding-left: 2px;

View File

@ -346,7 +346,10 @@
<FormSection>
<template #label>Server Performance</template>
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44d184ac3e6372786ad7d25236853c5ed53bf6f0
<FormSwitch
v-model="enableServerMachineStats"
class="_formBlock"
@ -363,6 +366,8 @@
<template #label>{{
i18n.ts.enableIdenticonGeneration
}}</template>
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 0cac6f018d (refactor: make identicons and server metrics optional)
@ -376,6 +381,7 @@
>>>>>>> 703f28a1ab (refactor: make identicons and server metrics optional)
=======
>>>>>>> 0cac6f018d (refactor: make identicons and server metrics optional)
>>>>>>> 44d184ac3e6372786ad7d25236853c5ed53bf6f0
</FormSwitch>
</FormSection>

View File

@ -53,6 +53,9 @@ html {
sans-serif;
}
}
* {
scrollbar-color: var(--scrollbarHandle) transparent;
}
body::-webkit-scrollbar {
width: 12px;
height: 12px;

View File

@ -81,6 +81,10 @@
"@octofloofy@ck.octofloofy.ink",
"@pauliehedron@infosec.town",
"@soulthunk@lethallava.land",
<<<<<<< HEAD
"@bumble@ibe.social",
=======
>>>>>>> 44d184ac3e6372786ad7d25236853c5ed53bf6f0
"\nInterkosmos Link"
]
}