diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index 4613d090fa..b2b5d2645a 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -69,7 +69,7 @@ const MobileNav = {
this.$refs.notifications.markAsSeen()
},
onScroll ({ target: { scrollTop, clientHeight, scrollHeight } }) {
- if (this.$store.getters.mergedConfig.autoLoad && scrollTop + clientHeight >= scrollHeight) {
+ if (scrollTop + clientHeight >= scrollHeight) {
this.$refs.notifications.fetchOlderNotifications()
}
}
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index f89c0480af..7f06d0bd3a 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -53,16 +53,6 @@
-
-
- {{ $t('settings.autoload') }}
-
-
-
-
- {{ $t('settings.reply_link_preview') }}
-
-
{{ $t('settings.emoji_reactions_on_timeline') }}
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index bac73022c7..a829bd02c9 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -148,7 +148,6 @@ const Timeline = {
const bodyBRect = document.body.getBoundingClientRect()
const height = Math.max(bodyBRect.height, -(bodyBRect.y))
if (this.timeline.loading === false &&
- this.$store.getters.mergedConfig.autoLoad &&
this.$el.offsetHeight > 0 &&
(window.innerHeight + window.pageYOffset) >= (height - 750)) {
this.fetchOlderStatuses()
diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index 8bba2b97e9..cfa48d36e0 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -147,7 +147,6 @@
"profile_tab": "الملف الشخصي",
"radii_help": "",
"replies_in_timeline": "الردود على الخيط الزمني",
- "reply_link_preview": "",
"reply_visibility_all": "عرض كافة الردود",
"reply_visibility_following": "",
"reply_visibility_self": "",
diff --git a/src/i18n/ca.json b/src/i18n/ca.json
index 42d7745cc5..dfe23276f5 100644
--- a/src/i18n/ca.json
+++ b/src/i18n/ca.json
@@ -145,7 +145,6 @@
"profile_tab": "Perfil",
"radii_help": "Configura l'arrodoniment de les vores (en píxels)",
"replies_in_timeline": "Replies in timeline",
- "reply_link_preview": "Mostra el missatge citat en passar el ratolí per sobre de l'enllaç de resposta",
"reply_visibility_all": "Mostra totes les respostes",
"reply_visibility_following": "Mostra només les respostes a entrades meves o d'usuàries que jo segueixo",
"reply_visibility_self": "Mostra només les respostes a entrades meves",
diff --git a/src/i18n/cs.json b/src/i18n/cs.json
index 42e7556754..1d64d9c3d5 100644
--- a/src/i18n/cs.json
+++ b/src/i18n/cs.json
@@ -206,7 +206,6 @@
"profile_tab": "Profil",
"radii_help": "Nastavit zakulacení rohů rozhraní (v pixelech)",
"replies_in_timeline": "Odpovědi v časové ose",
- "reply_link_preview": "Povolit náhledy odkazu pro odpověď při přejetí myši",
"reply_visibility_all": "Zobrazit všechny odpovědi",
"reply_visibility_following": "Zobrazit pouze odpovědi směřované na mě nebo uživatele, které sleduji",
"reply_visibility_self": "Zobrazit pouze odpovědi směřované na mě",
diff --git a/src/i18n/de.json b/src/i18n/de.json
index a44e58cb65..fc04a474fa 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -225,7 +225,6 @@
"profile_tab": "Profil",
"radii_help": "Kantenrundung (in Pixel) der Oberfläche anpassen",
"replies_in_timeline": "Antworten in der Zeitleiste",
- "reply_link_preview": "Antwortlink-Vorschau beim Überfahren mit der Maus aktivieren",
"reply_visibility_all": "Alle Antworten zeigen",
"reply_visibility_following": "Zeige nur Antworten an mich oder an Benutzer, denen ich folge",
"reply_visibility_self": "Nur Antworten an mich anzeigen",
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 796a527cf3..e8a083e41a 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -385,7 +385,6 @@
"profile_tab": "Profile",
"radii_help": "Set up interface edge rounding (in pixels)",
"replies_in_timeline": "Replies in timeline",
- "reply_link_preview": "Enable reply-link preview on mouse hover",
"reply_visibility_all": "Show all replies",
"reply_visibility_following": "Only show replies directed at me or users I'm following",
"reply_visibility_self": "Only show replies directed at me",
diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index 6c5b3a745e..ce0490aee1 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -203,7 +203,6 @@
"profile_tab": "Profilo",
"radii_help": "Agordi fasadan rondigon de randoj (bildere)",
"replies_in_timeline": "Respondoj en tempolinio",
- "reply_link_preview": "Ŝalti respond-ligilan antaŭvidon dum musa ŝvebo",
"reply_visibility_all": "Montri ĉiujn respondojn",
"reply_visibility_following": "Montri nur respondojn por mi aŭ miaj abonatoj",
"reply_visibility_self": "Montri nur respondojn por mi",
diff --git a/src/i18n/es.json b/src/i18n/es.json
index 931d4c6486..b495bc6237 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -307,7 +307,6 @@
"profile_tab": "Perfil",
"radii_help": "Establezca el redondeo de las esquinas de la interfaz (en píxeles)",
"replies_in_timeline": "Réplicas en la línea temporal",
- "reply_link_preview": "Activar la previsualización del enlace de responder al pasar el ratón por encima",
"reply_visibility_all": "Mostrar todas las réplicas",
"reply_visibility_following": "Solo mostrar réplicas para mí o usuarios a los que sigo",
"reply_visibility_self": "Solo mostrar réplicas para mí",
diff --git a/src/i18n/et.json b/src/i18n/et.json
index b5ae4275ef..41dfaa4a2e 100644
--- a/src/i18n/et.json
+++ b/src/i18n/et.json
@@ -130,7 +130,6 @@
"nsfw_clickthrough": "Peida tööks-mittesobivad(NSFW) manuste hiireklõpsu taha",
"profile_background": "Profiilitaust",
"profile_banner": "Profiilibänner",
- "reply_link_preview": "Luba algpostituse kuvamine vastustes",
"set_new_avatar": "Vali uus profiilipilt",
"set_new_profile_background": "Vali uus profiilitaust",
"set_new_profile_banner": "Vali uus profiilibänner",
diff --git a/src/i18n/eu.json b/src/i18n/eu.json
index 1c75bf7543..09586ebd13 100644
--- a/src/i18n/eu.json
+++ b/src/i18n/eu.json
@@ -307,7 +307,6 @@
"profile_tab": "Profila",
"radii_help": "Konfiguratu interfazearen ertzen biribiltzea (pixeletan)",
"replies_in_timeline": "Denbora-lerroko erantzunak",
- "reply_link_preview": "Gaitu erantzun-estekaren aurrebista arratoiarekin",
"reply_visibility_all": "Erakutsi erantzun guztiak",
"reply_visibility_following": "Erakutsi bakarrik niri zuzendutako edo nik jarraitutako erabiltzaileen erantzunak",
"reply_visibility_self": "Erakutsi bakarrik niri zuzendutako erantzunak",
diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index 3e63377f3e..5a7a9408f1 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -250,7 +250,6 @@
"profile_tab": "Profiili",
"radii_help": "Aseta reunojen pyöristys (pikseleinä)",
"replies_in_timeline": "Keskustelut aikajanalla",
- "reply_link_preview": "Keskusteluiden vastauslinkkien esikatselu",
"reply_visibility_all": "Näytä kaikki vastaukset",
"reply_visibility_following": "Näytä vain vastaukset minulle tai seuraamilleni käyttäjille",
"reply_visibility_self": "Näytä vain vastaukset minulle",
diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index 31b69a0f88..90ffc244e0 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -282,7 +282,6 @@
"profile_tab": "Profil",
"radii_help": "Vous pouvez ici choisir le niveau d'arrondi des angles de l'interface (en pixels)",
"replies_in_timeline": "Réponses au journal",
- "reply_link_preview": "Afficher un aperçu lors du survol de liens vers une réponse",
"reply_visibility_all": "Montrer toutes les réponses",
"reply_visibility_following": "Afficher uniquement les réponses adressées à moi ou aux personnes que je suis",
"reply_visibility_self": "Afficher uniquement les réponses adressées à moi",
diff --git a/src/i18n/ga.json b/src/i18n/ga.json
index 7a10ba405f..9e5b38434f 100644
--- a/src/i18n/ga.json
+++ b/src/i18n/ga.json
@@ -147,7 +147,6 @@
"profile_tab": "Próifíl",
"radii_help": "Cruinniú imeall comhéadan a chumrú (i bpicteilíní)",
"replies_in_timeline": "Freagraí sa amlíne",
- "reply_link_preview": "Cumasaigh réamhamharc nasc freagartha ar chlár na luiche",
"reply_visibility_all": "Taispeáin gach freagra",
"reply_visibility_following": "Taispeáin freagraí amháin atá dírithe ar mise nó ar úsáideoirí atá mé ag leanúint",
"reply_visibility_self": "Taispeáin freagraí amháin atá dírithe ar mise",
diff --git a/src/i18n/he.json b/src/i18n/he.json
index 1c034960d6..77ec4e0425 100644
--- a/src/i18n/he.json
+++ b/src/i18n/he.json
@@ -240,7 +240,6 @@
"profile_tab": "פרופיל",
"radii_help": "קבע מראש עיגול פינות לממשק (בפיקסלים)",
"replies_in_timeline": "תגובות בציר הזמן",
- "reply_link_preview": "החל תצוגה מקדימה של לינק-תגובה בעת ריחוף עם העכבר",
"reply_visibility_all": "הראה את כל התגובות",
"reply_visibility_following": "הראה תגובות שמופנות אליי או לעקובים שלי בלבד",
"reply_visibility_self": "הראה תגובות שמופנות אליי בלבד",
diff --git a/src/i18n/hu.json b/src/i18n/hu.json
index e98fdc44a6..ea6311dbc5 100644
--- a/src/i18n/hu.json
+++ b/src/i18n/hu.json
@@ -52,7 +52,6 @@
"nsfw_clickthrough": "NSFW átkattintási tartalom elrejtésének engedélyezése",
"profile_background": "Profil háttérkép",
"profile_banner": "Profil Banner",
- "reply_link_preview": "Válasz-link előzetes mutatása egér rátételkor",
"set_new_avatar": "Új avatár",
"set_new_profile_background": "Új profil háttér beállítása",
"set_new_profile_banner": "Új profil banner",
diff --git a/src/i18n/it.json b/src/i18n/it.json
index 24520c0909..a5b94338d7 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -67,7 +67,6 @@
"nsfw_clickthrough": "Fai click per visualizzare gli allegati offuscati",
"profile_background": "Sfondo della tua pagina",
"profile_banner": "Stendardo del tuo profilo",
- "reply_link_preview": "Visualizza le risposte al passaggio del cursore",
"set_new_avatar": "Scegli una nuova icona",
"set_new_profile_background": "Scegli un nuovo sfondo per la tua pagina",
"set_new_profile_banner": "Scegli un nuovo stendardo per il tuo profilo",
diff --git a/src/i18n/ja_easy.json b/src/i18n/ja_easy.json
index 978e43b30c..52da09bfb6 100644
--- a/src/i18n/ja_easy.json
+++ b/src/i18n/ja_easy.json
@@ -343,7 +343,6 @@
"profile_tab": "プロフィール",
"radii_help": "インターフェースのまるさをせっていする。",
"replies_in_timeline": "タイムラインのリプライ",
- "reply_link_preview": "カーソルをかさねたとき、リプライのプレビューをみる",
"reply_visibility_all": "すべてのリプライをみる",
"reply_visibility_following": "わたしにあてられたリプライと、フォローしているひとからのリプライをみる",
"reply_visibility_self": "わたしにあてられたリプライをみる",
diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index 2ca7dca81d..89222b454a 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -308,7 +308,6 @@
"profile_tab": "プロフィール",
"radii_help": "インターフェースの丸さを設定する。",
"replies_in_timeline": "タイムラインのリプライ",
- "reply_link_preview": "カーソルを重ねたとき、リプライのプレビューを見る",
"reply_visibility_all": "すべてのリプライを見る",
"reply_visibility_following": "私に宛てられたリプライと、フォローしている人からのリプライを見る",
"reply_visibility_self": "私に宛てられたリプライを見る",
diff --git a/src/i18n/ko.json b/src/i18n/ko.json
index 402a354c9a..516d95d13e 100644
--- a/src/i18n/ko.json
+++ b/src/i18n/ko.json
@@ -172,7 +172,6 @@
"profile_tab": "프로필",
"radii_help": "인터페이스 모서리 둥글기 (픽셀 단위)",
"replies_in_timeline": "답글을 타임라인에",
- "reply_link_preview": "마우스를 올려서 답글 링크 미리보기 활성화",
"reply_visibility_all": "모든 답글 보기",
"reply_visibility_following": "나에게 직접 오는 답글이나 내가 팔로우 중인 사람에게서 오는 답글만 표시",
"reply_visibility_self": "나에게 직접 전송 된 답글만 보이기",
diff --git a/src/i18n/nb.json b/src/i18n/nb.json
index 248b05bca2..877f63db91 100644
--- a/src/i18n/nb.json
+++ b/src/i18n/nb.json
@@ -293,7 +293,6 @@
"profile_tab": "Profil",
"radii_help": "Bestem hvor runde hjørnene i brukergrensesnittet skal være (i piksler)",
"replies_in_timeline": "Svar på tidslinje",
- "reply_link_preview": "Vis en forhåndsvisning når du holder musen over svar til en status",
"reply_visibility_all": "Vis alle svar",
"reply_visibility_following": "Vis bare svar som er til meg eller folk jeg følger",
"reply_visibility_self": "Vis bare svar som er til meg",
diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index bf270f87d8..c9abb9ae8c 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -217,7 +217,6 @@
"profile_tab": "Profiel",
"radii_help": "Stel afronding van hoeken in de interface in (in pixels)",
"replies_in_timeline": "Antwoorden in tijdlijn",
- "reply_link_preview": "Antwoord-link weergave inschakelen bij aanwijzen met muisaanwijzer",
"reply_visibility_all": "Alle antwoorden tonen",
"reply_visibility_following": "Enkel antwoorden tonen die aan mij of gevolgde gebruikers gericht zijn",
"reply_visibility_self": "Enkel antwoorden tonen die aan mij gericht zijn",
diff --git a/src/i18n/oc.json b/src/i18n/oc.json
index 680ad6dd02..d6ea6cf765 100644
--- a/src/i18n/oc.json
+++ b/src/i18n/oc.json
@@ -252,7 +252,6 @@
"profile_tab": "Perfil",
"radii_help": "Configurar los caires arredondits de l’interfàcia (en pixèls)",
"replies_in_timeline": "Responsas del flux",
- "reply_link_preview": "Activar l’apercebut en passar la mirga",
"reply_visibility_all": "Mostrar totas las responsas",
"reply_visibility_following": "Mostrar pas que las responsas que me son destinada a ieu o un utilizaire que seguissi",
"reply_visibility_self": "Mostrar pas que las responsas que me son destinadas",
diff --git a/src/i18n/pl.json b/src/i18n/pl.json
index 61e0931873..9670d2d98e 100644
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@@ -362,7 +362,6 @@
"profile_tab": "Profil",
"radii_help": "Ustaw zaokrąglenie krawędzi interfejsu (w pikselach)",
"replies_in_timeline": "Odpowiedzi na osi czasu",
- "reply_link_preview": "Włącz dymek z podglądem postu po najechaniu na znak odpowiedzi",
"reply_visibility_all": "Pokazuj wszystkie odpowiedzi",
"reply_visibility_following": "Pokazuj tylko odpowiedzi skierowane do mnie i osób które obserwuję",
"reply_visibility_self": "Pokazuj tylko odpowiedzi skierowane do mnie",
diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 41a3448380..5e8e6fddf1 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -203,7 +203,6 @@
"profile_tab": "Perfil",
"radii_help": "Arredondar arestas da interface (em pixel)",
"replies_in_timeline": "Respostas na linha do tempo",
- "reply_link_preview": "Habilitar a pré-visualização de de respostas ao passar o mouse.",
"reply_visibility_all": "Mostrar todas as respostas",
"reply_visibility_following": "Só mostrar respostas direcionadas a mim ou a usuários que sigo",
"reply_visibility_self": "Só mostrar respostas direcionadas a mim",
diff --git a/src/i18n/ro.json b/src/i18n/ro.json
index 3cee264fb5..22b8999f68 100644
--- a/src/i18n/ro.json
+++ b/src/i18n/ro.json
@@ -52,7 +52,6 @@
"nsfw_clickthrough": "Permite ascunderea al atașamentelor NSFW",
"profile_background": "Fundalul de profil",
"profile_banner": "Banner de profil",
- "reply_link_preview": "Permite previzualizarea linkului de răspuns la planarea de mouse",
"set_new_avatar": "Setează avatar nou",
"set_new_profile_background": "Setează fundal nou",
"set_new_profile_banner": "Setează banner nou la profil",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 08f05d18ee..76b0e3aae0 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -211,7 +211,6 @@
"profile_tab": "Профиль",
"radii_help": "Скругление углов элементов интерфейса (в пикселях)",
"replies_in_timeline": "Ответы в ленте",
- "reply_link_preview": "Включить предварительный просмотр ответа при наведении мыши",
"reply_visibility_all": "Показывать все ответы",
"reply_visibility_following": "Показывать только ответы мне или тех на кого я подписан",
"reply_visibility_self": "Показывать только ответы мне",
diff --git a/src/i18n/te.json b/src/i18n/te.json
index 6022349d38..4e64be87c5 100644
--- a/src/i18n/te.json
+++ b/src/i18n/te.json
@@ -178,7 +178,6 @@
"settings.profile_tab": "Profile",
"settings.radii_help": "Set up interface edge rounding (in pixels)",
"settings.replies_in_timeline": "Replies in timeline",
- "settings.reply_link_preview": "Enable reply-link preview on mouse hover",
"settings.reply_visibility_all": "Show all replies",
"settings.reply_visibility_following": "Only show replies directed at me or users I'm following",
"settings.reply_visibility_self": "Only show replies directed at me",
diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 7e620bdf7e..bda34633af 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -299,7 +299,6 @@
"profile_tab": "个人资料",
"radii_help": "设置界面边缘的圆角 (单位：像素)",
"replies_in_timeline": "时间线中的回复",
- "reply_link_preview": "启用鼠标悬停时预览回复链接",
"reply_visibility_all": "显示所有回复",
"reply_visibility_following": "只显示发送给我的回复/发送给我关注的用户的回复",
"reply_visibility_self": "只显示发送给我的回复",
diff --git a/src/modules/config.js b/src/modules/config.js
index e0fe72df5f..409d77a451 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -31,9 +31,7 @@ export const defaultState = {
preloadImage: true,
loopVideo: true,
loopVideoSilentOnly: true,
- autoLoad: true,
streaming: false,
- hoverPreview: true,
emojiReactionsOnTimeline: true,
autohideFloatingPostButton: false,
pauseOnUnfocused: true,