mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-12-14 22:58:12 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into beta

Browse Source
This commit is contained in:
ThatOneCalculator 2023-05-01 23:08:54 -07:00
commit cc5350bc10
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/src/server/api/endpoints.ts
View File

@ -533,7 +533,7 @@ const eps = [
["i/export-following", ep___i_exportFollowing],
["i/export-mute", ep___i_exportMute],
["i/export-notes", ep___i_exportNotes],
["i/import-posts", ep___i_importPosts],
// ["i/import-posts", ep___i_importPosts],
["i/export-user-lists", ep___i_exportUserLists],
["i/favorites", ep___i_favorites],
["i/gallery/likes", ep___i_gallery_likes],

11
packages/client/src/pages/settings/import-export.vue
View File

@ -16,23 +16,20 @@
{{ i18n.ts.export }}</MkButton
>
</FormFolder>
<FormFolder class="_formBlock">
<!-- <FormFolder class="_formBlock">
<template #label>{{ i18n.ts.import }}</template>
<template #icon
><i class="ph-upload-simple ph-bold ph-lg"></i
></template>
<!-- <FormSwitch v-model="signatureCheck" class="_formBlock">
Mastodon import? (not Akkoma!)
</FormSwitch> -->
<FormRadios v-model="importType" class="_formBlock">
<option value="calckey">Calckey/Misskey</option>
<option value="mastodon">Mastodon</option>
<!-- <option :disabled="true" value="akkoma">
<option :disabled="true" value="akkoma">
Pleroma/Akkoma (soon)
</option>
<option :disabled="true" value="twitter">
Twitter (soon)
</option> -->
</option>
</FormRadios>
<MkButton
primary
@ -42,7 +39,7 @@
><i class="ph-upload-simple ph-bold ph-lg"></i>
{{ i18n.ts.import }}</MkButton
>
</FormFolder>
</FormFolder> -->
</FormSection>
<FormSection>
<template #label>{{