From 738ad9759ad1c38fb096d3fa567c48bd7a8f49e9 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 30 May 2019 14:30:38 +0300 Subject: Change default to single column UI (#10847) Keep current setting for users who were active within the last month --- config/settings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/settings.yml b/config/settings.yml index 0c3510699..805624d3e 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -31,7 +31,7 @@ defaults: &defaults noindex: false theme: 'default' aggregate_reblogs: true - advanced_layout: true + advanced_layout: false notification_emails: follow: false reblog: false -- cgit From acc74bed120812d92f9a63332ffd476c0c8a9f77 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Fri, 31 May 2019 01:27:19 +0900 Subject: Remove dependency on fibers (#10902) --- config/webpack/rules/css.js | 1 - package.json | 1 - yarn.lock | 9 +-------- 3 files changed, 1 insertion(+), 10 deletions(-) (limited to 'config') diff --git a/config/webpack/rules/css.js b/config/webpack/rules/css.js index 27905a617..3b5b51232 100644 --- a/config/webpack/rules/css.js +++ b/config/webpack/rules/css.js @@ -21,7 +21,6 @@ module.exports = { { loader: 'sass-loader', options: { - fiber: require('fibers'), implementation: require('sass'), sourceMap: true, }, diff --git a/package.json b/package.json index 1747dde32..be0e5820a 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,6 @@ "escape-html": "^1.0.3", "exif-js": "^2.3.0", "express": "^4.17.1", - "fibers": "^3.1.1", "file-loader": "^3.0.1", "font-awesome": "^4.7.0", "glob": "^7.1.1", diff --git a/yarn.lock b/yarn.lock index f1e5fe9b0..756b4a434 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3014,7 +3014,7 @@ detect-file@^1.0.0: resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= -detect-libc@^1.0.2, detect-libc@^1.0.3: +detect-libc@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= @@ -3810,13 +3810,6 @@ fbjs@^0.8.4: setimmediate "^1.0.5" ua-parser-js "^0.7.18" -fibers@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/fibers/-/fibers-3.1.1.tgz#0238902ca938347bd779523692fbeefdf4f688ab" - integrity sha512-dl3Ukt08rHVQfY8xGD0ODwyjwrRALtaghuqGH2jByYX1wpY+nAnRQjJ6Dbqq0DnVgNVQ9yibObzbF4IlPyiwPw== - dependencies: - detect-libc "^1.0.3" - figgy-pudding@^3.5.1: version "3.5.1" resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790" -- cgit From 7f589b66dd04d1af7685d45a1bb96e20951ab602 Mon Sep 17 00:00:00 2001 From: Marek Ľach Date: Fri, 31 May 2019 17:33:09 +0200 Subject: Small update for sk.yml (#10913) --- config/locales/sk.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/locales/sk.yml b/config/locales/sk.yml index e770d26ba..778a8f42f 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -49,7 +49,7 @@ sk: few: Sledovateľov one: Sledovateľ other: Sledovatelia - following: Sledovaní + following: Následujem joined: Pridal/a sa v %{date} last_active: naposledy aktívny link_verified_on: Vlastníctvo tohto odkazu bolo skontrolované %{date} @@ -214,7 +214,7 @@ sk: silence_account: "%{name} utíšil/a účet %{target}" suspend_account: "%{name} zablokoval/a účet používateľa %{target}" unassigned_report: "%{name} odobral/a report od %{target}" - unsilence_account: "%{name} zrušil/a utíšenie účtu používateľa %{target}" + unsilence_account: "%{name} zrušil/a stíšenie účtu používateľa %{target}" unsuspend_account: "%{name} zrušil/a blokovanie účtu používateľa %{target}" update_custom_emoji: "%{name} aktualizoval/a emoji %{target}" update_status: "%{name} aktualizoval/a status pre %{target}" -- cgit