2533 Commits (a7f37deca5fe10a096f97f8dac2fac4e4890920f)

Author SHA1 Message Date
Thibaut Girka ff76f6de4f Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko fd352ec288 Fix account tags not being saved correctly (#11507)
5 years ago
Eugen Rochko 6362ac6617 Fix admin dashboard missing latest features (#11505)
5 years ago
Eugen Rochko 191392e5c3 Add trends UI with admin and user settings (#11502)
5 years ago
Thibaut Girka 7a55d93244 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 05e9cd13eb Change admin UI for hashtags and add back whitelisted trends (#11490)
5 years ago
Thibaut Girka 4973ba2d1f Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 825dc3ca22 Add whitelist mode (#11291)
5 years ago
Thibaut Girka 6c7a3268c9 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
mayaeh 7d13da568e Add `tootctl preview_cards remove` (#11320)
5 years ago
ThibG 9000d604e9 Change settings to show restricted accounts only what they have access to (#11394)
5 years ago
Thibaut Girka 124a1d3880 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Yamagishi Kazutoshi 28ac87249e Remove modules.localIdentName (#11398)
5 years ago
dependabot-preview[bot] 290c72062e Bump css-loader from 2.1.1 to 3.1.0 (#11382)
5 years ago
Thibaut Girka 579ccb0bb9 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 6be7b414e2 Change unconfirmed user login behaviour (#11375)
5 years ago
Eugen Rochko 2b4fa0d6fa Change locale detection to run once per session (#8657)
5 years ago
Eugen Rochko f9ed4354b1 Remove WebSub subscriptions (#11303)
5 years ago
Thibaut Girka eecce7e59b Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG c2126e3f98 Add ActivityPub actor representing the entire server (#11321)
5 years ago
ThibG 9015b19e09 Add setting to disable the anti-spam (#11296)
5 years ago
Daigo 3 Dango 4b91fb0ea7 Make puma bind address configurable with BIND env var (#11326)
5 years ago
Eugen Rochko c56e6fd7a1 Add option to disable real-time updates in web UI (#9984)
5 years ago
Eugen Rochko 31d4878fbb Change default interface of web and streaming from 0.0.0.0 to 127.0.0.1 (#11302)
5 years ago
Daigo 3 Dango 6354a48308 Make puma bind address configurable with BIND env var (#11326)
5 years ago
Eugen Rochko 9dead08055 Add option to disable real-time updates in web UI (#9984)
5 years ago
Yamagishi Kazutoshi d309685866 Fix consistent interpolations (#11317)
5 years ago
Eugen Rochko ac853dca51 Add periodic removal of older thumbnails for preview cards (#11304)
5 years ago
Eugen Rochko c4a05eaa87 New Crowdin translations (#11153)
5 years ago
Eugen Rochko fe299d3417 Change default interface of web and streaming from 0.0.0.0 to 127.0.0.1 (#11302)
5 years ago
Eugen Rochko f70b20a01c Add a spam check (#11217)
5 years ago
Eugen Rochko e17c937f65 Remove unused remote unfollow controller (#11250)
5 years ago
Eugen Rochko 56f0203c66 Refactor controllers for statuses, accounts, and more (#11249)
5 years ago
Eugen Rochko fbbcbd940d Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)
5 years ago
Thibaut Girka 7e83206853 Re-add route for direct timeline
5 years ago
Thibaut Girka d7a7f21646 Merge commit '64909cf0d988fb09917c41cfbc81b1e9a5132aca' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 4931208dd8 Remove Salmon and PubSubHubbub (#11205)
5 years ago
Eugen Rochko d9f42ba34b Remove deprecated REST API `GET /api/v1/statuses/:id/card` (#11213)
5 years ago
Eugen Rochko 5704e5c963 Remove deprecated REST API `POST /api/v1/notifications/dismiss?id=:id` (#11214)
5 years ago
Eugen Rochko 6cae1b40bf Remove deprecated REST API `GET /api/v1/timelines/direct` (#11212)
5 years ago
Thibaut Girka 9866c2bfff Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 3ce4cdd552 Remove unused StatsD code and expose StatsD as a global variable (#11232)
5 years ago
Thibaut Girka acbed64f3d Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG 4b3d91dc2c Add option to disable blurhash previews (#11188)
5 years ago
Thibaut Girka 1177694c3e Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 47e6cb8ee5 New Crowdin translations (#11144)
5 years ago
Eugen Rochko 3ca5768f94 New Crowdin translations (#11116)
5 years ago
Eugen Rochko c078bf94a9 Fix converted media being saved with original extension and mime type (#11130)
5 years ago
Eugen Rochko 433036ab8c Add moderation API (#9387)
5 years ago
Thibaut Girka e1b3251b3c Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Thibaut Girka 22439f9ded Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko a83c65ecdf Fix inconsistent interpolation in sk.yml (#11124)
5 years ago
Eugen Rochko cc1c520434 New Crowdin translations (#11077)
5 years ago
Thibaut Girka 4741ea0029 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko aad57e3b96 New Crowdin translations (#11075)
6 years ago
Eugen Rochko e0ef0f1a83 New Crowdin translations (#11073)
6 years ago
Eugen Rochko 71ff3d822f New Crowdin translations (#11069)
6 years ago
Eugen Rochko e6fc96ff62 New Crowdin translations (#11062)
6 years ago
Eugen Rochko 24f367b383 New Crowdin translations (#11060)
6 years ago
Eugen Rochko d815c8e473 Fix Serbian pluralization rules requiring a "many" key (#11061)
6 years ago
mayaeh cd9d96c895 i18n: Update Japanese translations (#11035)
6 years ago
Thibaut Girka 1b4242ddf7 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Masoud Abkenar 572a3dfc21 l10n: update Persian translations (fa.yml) (#11052)
6 years ago
Masoud Abkenar d12625fa74 l10n: update Persian translation (#11050)
6 years ago
唐宗勛 cca89f3e06 update zh-CN translations (#11046)
6 years ago
Jeong Arm f3c34e3743 Fix Korean translate (#11047)
6 years ago
Eugen Rochko f03dd5728a Add German translations (#11043)
6 years ago
Thibaut Girka 5a158899bc Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Marek Ľach 30946461be Update simple_form.sk.yml (#11028)
6 years ago
manuelviens 602bccc0ab Update simple_form.fr.yml (#11021)
6 years ago
manuelviens 2e12b42f2b Update fr.yml (#11023)
6 years ago
Marek Ľach 843bc1d3da Update sk.yml (#11015)
6 years ago
Jeong Arm bd5ab2542c Add missing Korean translations (#11014)
6 years ago
spla df11f10efd i18n: Update Catalan translations (#10998)
6 years ago
Aditoo17 2d601a278c I18n: Update Czech translation 🇨🇿 (#10995)
6 years ago
Thibaut Girka 00552d2f79 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko b788e58ea4 Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)
6 years ago
Alix Rossi 9cf5686de5 i18n: Update Corsican translations (#10987)
6 years ago
Eugen Rochko 8bf8d6d9d9 Change preferences page into appearance, notifications, and other (#10977)
6 years ago
Eugen Rochko 87f5646ec3 Add waiting time to list of pending accounts in admin UI (#10985)
6 years ago
Thibaut Girka a76c660645 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
6 years ago
Jeong Arm ca61d7577a Add missing Korean translations (#10962)
6 years ago
Yamagishi Kazutoshi ac8f6df6f1 Replace from uglifyjs to terser (#10956)
6 years ago
Thibaut Girka a4e0071538 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
6 years ago
Marek Ľach 3e18c4ea5f Small update for sk.yml (#10913)
6 years ago
Yamagishi Kazutoshi 93ef0e7555 Remove dependency on fibers (#10902)
6 years ago
Thibaut Girka 206d0ea6a2 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 865c72cde3 Change default to single column UI (#10847)
6 years ago
mayaeh 7403b0ec05 Update Japanese translations. (#10875)
6 years ago
Thibaut Girka b9c5aed987 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Hinaloe ae5f2716a5 Fix undefined method error (#10868)
6 years ago
mayaeh a08bfea202 Fix undefined method error. (#10867)
6 years ago
Alix Rossi c84a0df608 Update simple_form.co.yml (#10862)
6 years ago
ThibG 875faa1da6 Improve rate limiting (#10860)
6 years ago
Thibaut Girka d46668d34b Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Marek Ľach 16ae227935 Update simple_form.sk.yml (#10842)
6 years ago
Aditoo17 40f6439e03 I18n: Update Czech translation (#10832)
6 years ago
Eugen Rochko a1bceb2cb6 Add responsive panels to the single-column layout (#10820)
6 years ago
Thibaut Girka d445d5833e Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Marek Ľach 42bdd0766d Update sk.yml (#10788)
6 years ago
Thibaut Girka e21662d370 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Marek Ľach 7a88a5b44a sk.yml grammar update (#10786)
6 years ago
Thibaut Girka fd5da4033e Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Marek Ľach 875d18d636 Small corrections for sk translation (#10784)
6 years ago
Aditoo17 7660ac5008 I18n: Update Czech translation (#10781)
6 years ago
Thibaut Girka 08a793cbd9 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 7aece1eec5 Add option for default toot content-type
6 years ago
Alix Rossi b34a562b63 i18n: Update Corsican translation (#10770)
6 years ago
Thibaut Girka 422dd06806 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
manuelviens 7898b67b3d Update simple_form.fr.yml (#10756)
6 years ago
ThibG f1a3135809 Record account suspend/silence time and keep track of domain blocks (#10660)
6 years ago
Marek Ľach 0aaca064a6 Update slovak simple_forms (#10763)
6 years ago
Thibaut Girka 5262820fae Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Alix Rossi 062684bcf8 i18n: Update French translations (#10747)
6 years ago
Alix Rossi 1959e4e5ec i18n: Update Corsican translations (#10746)
6 years ago
Thibaut Girka 1bf48b01e3 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
manuelviens f0b5e0c46d Update simple_form.fr.yml (#10726)
6 years ago
Marek Ľach 5ba0684958 Add strings for Slovak (#10734)
6 years ago
manuelviens 221a6a0e6d Update fr.yml (#10727)
6 years ago
spla 13244f7bb3 i18n Update Catalan translation (#10719)
6 years ago
mayaeh 683a5ae765 i18n: Update Japanese translations (#10706)
6 years ago
Thibaut Girka 23829e09f5 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Marek Ľach a20c26aba7 Minor Slovak locale update (#10705)
6 years ago
Aditoo17 71fd62835e I18n: Update Czech translation 🇨🇿 (#10704)
6 years ago
Thibaut Girka 73bc58c656 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Alix Rossi 4bf9e83f85 i18n: Update Corsican translation (#10692)
6 years ago
Thibaut Girka 06bcab6e99 Fix CSP when PAPERCLIP_ROOT_URL is set to a different host
6 years ago
Thibaut Girka 5d24d50987 Fix CSP when dealing with S3 hosts
6 years ago
ThibG 8c716f917f Provide a link to existing domain block when trying to block an already-blocked domain (#10663)
6 years ago
dependabot[bot] 592ab699fe Bump rack-attack from 5.4.2 to 6.0.0 (#10599)
6 years ago
Thibaut Girka c4865cbd25 Add site-wide options to show reblogs and replies in local/public timelines
6 years ago
ThibG 05bf900109 Minor fixes to the French translation (#10662)
6 years ago
Marek Ľach 63e9783e7d New string added for Slovak translation (#10637)
6 years ago
Thibaut Girka 0f97c82eac Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 55449c0b41 Fix stoplight logging to stderr separate from Rails logger (#10624)
6 years ago
Thibaut Girka 6f85bb754b Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
marcin mikołajczak ebd171eb0f i18n: Fix misleading strings in Polish translation (#10615)
6 years ago
jeroenpraat 5205009df6 Small fix Dutch translation (#10612)
6 years ago
Yamagishi Kazutoshi a59d2e0926 i18n: Update Catalan translation (#10559)
6 years ago
jeroenpraat f7cc05db80 Update NL (Dutch) translation (#10601)
6 years ago
Thibaut Girka 3673665b46 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 707ae5d37a Add forgotten text
6 years ago
Thibaut Girka c22175bb86 Allow turning keybase off instance-wide
6 years ago
Marek Ľach b5850a99aa Some new strings for Slovak (#10596)
6 years ago
Marek Ľach e82b7347a2 Update sk.yml translation again (#10589)
6 years ago
Marek Ľach 970dfb92a9 Important Slovak grammar fixes (#10585)
6 years ago
Marek Ľach d6c6431e5c Updates the Slovak translation further (#10584)
6 years ago
Alix Rossi 159d224bba i18n: Update Corsican translation (#10583)
6 years ago
Marek Ľach 709b519bed Small SK locale fixes (#10561)
6 years ago
Marek Ľach ff1e9408e4 New strings added into the Slovak translation (#10562)
6 years ago
Renato "Lond" Cerqueira 83420b9d41 Add new pt-br translations (#10564)
6 years ago
Thibaut Girka f8a3c00755 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Quentí aee82e3b73 [i18n] Update for Occitan language (#10548)
6 years ago
Thibaut Girka 5a24934449 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Evgeny Petrov 4c19204392 i18n: Russian localization update (#10515)
6 years ago
Eugen Rochko a0000b9a94 Weblate translations (2019-04-10) (#10545)
6 years ago
mayaeh 020c6ae72f i18n: Update Japanese translations (#10536)
6 years ago
Aditoo17 7568f716a1 I18n: Add one more string (#10543)
6 years ago
Aditoo17 db70d35c3f I18n: Final Czech translation 🇨🇿 (#10542)
6 years ago
koyu fc14f14e20 Updated German translation (#10539)
6 years ago
Jeong Arm 70a6a8aabc Translation - Korean (#10540)
6 years ago
Alix Rossi 73bbfcb482 i18n: Update Corsican translations (#10538)
6 years ago
Thibaut Girka cde0ac1aa7 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 75ab8cef8f Change the groupings of menu items in settings navigation (#10533)
6 years ago
Eugen Rochko 13c1b5bac8 Add preference to disable e-mails about new pending accounts (#10529)
6 years ago
Eugen Rochko 7eb05b8724 Add "why do you want to join" field to invite requests (#10524)
6 years ago
Alix Rossi fb93400e7d i18n: Update Corsican translations (#10510)
6 years ago
ThibG a604f766e0 Fix batch actions not working on pending accounts (#10508)
6 years ago
Thibaut Girka 5c8f9a3220 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
koyu c66a043591 Updated German locales (#10505)
6 years ago
Alix Rossi a5a7780ad1 i18n: Update Corsican translations (#10504)
6 years ago
Aditoo17 20040927fc i18n: Update Czech translation (#10506)
6 years ago
Jeong Arm d035f4af41 Translate Korean (#10499)
6 years ago
Hugo "Slaynash" Flores 5858035e39 Updated french translations (#10498)
6 years ago
mayaeh 4f8beb3717 i18n: Update Japanese translations (#10494)
6 years ago
Alix Rossi 6893b404f2 i18n: Update Corsican translations (#10496)
6 years ago
Eugen Rochko c84c30c542 Improve blocked view of profiles (#10491)
6 years ago
Eugen Rochko 1ed2c9c16e Add rate limit for media proxy requests (#10490)
6 years ago
Aditoo17 12ebe48505 I18n: Update Czech translation (#10489)
6 years ago
koyu 59de320605 Updated German locales (#10488)
6 years ago
Eugen Rochko c34a7f5bd2 Add batch actions for approving and rejecting pending accounts (#10469)
6 years ago
marcin mikołajczak 0e7c4d0c69 i18n: Update Polish translation (#10479)
6 years ago
jeroenpraat 4c20f5376a Dutch (nl) translation (#10474)
6 years ago
Thibaut Girka a835ea0e8f Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
spla f46cd7f002 i18n: update Catalan translation (#10458)
6 years ago
Jeong Arm e09e68b656 Translate Korean (devise) (#10464)
6 years ago
Jeong Arm 7deedcc0cf Esperanto translations (#10461)
6 years ago
Renato "Lond" Cerqueira a0eaf51ad4 Re-dd PT-br translations (#10459)
6 years ago
spla 8cc94c38cf i18n: update catalan translations (#10455)
6 years ago
Aditoo17 445568eff3 I18n: Improve Czech translation (#10454)
6 years ago
Thibaut Girka 5eb2632410 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
mayaeh 0615bc56aa i18n: Update Japanese translations (#10427)
6 years ago
Thibaut Girka 99336afaff Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko ed2862e249 Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413)
6 years ago
Aditoo17 0c334481cc I18n: Update Czech translation (#10419)
6 years ago
Jeong Arm 6c39082e87 Add missing Korean translations (#10416)
6 years ago
Alix Rossi 1ce9bd86b3 Update Corsican translations (#10418)
6 years ago
Thibaut Girka 1600aeb6cb Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Aditoo17 2a740c3e9a I18n: Update Czech translation (#10410)
6 years ago
Alex Gessner be7c92061c squashed identity proof updates (#10375)
6 years ago
Thibaut Girka 0117de0a01 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 364e49ae1f Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401)
6 years ago
Eugen Rochko 7aeb50cc89 Add order options to relationship manager UI (#10404)
6 years ago
Eugen Rochko f1a582dc15 Revert locales touched by automated translations (#10399)
6 years ago
Aditoo17 02d5017d85 Fix interpolations in some localizations (#10397)
6 years ago
Eugen Rochko 367ab6764f Remove unused ActivityPub `@context` values depending on response (#10378)
6 years ago
Thibaut Girka 451a79bda3 Revert "fix: update to emoji-mart 2.10.0 (#10281)"
6 years ago
Thibaut Girka cab7e62235 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG cffb8cb38d Fix HTML validation (#10354)
6 years ago
Thibaut Girka 1f70b51fff Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka e97d76632d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 88a85f2574 Change icons of features on admin dashboard to remove bias (#10366)
6 years ago
Eugen Rochko 1e8cf2cd43 Weblate translations (2019-03-24) (#10362)
6 years ago
Jeong Arm 5c8149fadf Change settings description (#10312)
6 years ago
Eugen Rochko c53f06b2c0 Do not show identity proofs menu item unless there are identity proofs (#10350)
6 years ago
Eugen Rochko c21bdc81d3 Add validations to admin settings (#10348)
6 years ago
Thibaut Girka 8410fcd3a7 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eric a35568286c cas_options :validate_url should be :service_validate_url (#10328)
6 years ago
Thibaut Girka c37bc0b268 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 0653375622 Add missing locales (bn, ga, hi) (#10295)
6 years ago
Eugen Rochko a3c41f3532 Add Keybase integration (#10297)
6 years ago
Thibaut Girka 365de06816 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko b1e0164848 Add dormant filter to relationship manager, rename other filters (#10308)
6 years ago
Aditoo17 e7cc42c913 I18n: Fix Czech pluralization (#10301)
6 years ago
mayaeh ba18cba5f7 Fix returned translations. (#10298)
6 years ago
Thibaut Girka 3f8f1b01c0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko efe8707657 Weblate translations (2019-03-16) (#10294)
6 years ago
Nolan Lawson e781d842a5 fix: update to emoji-mart 2.10.0 (#10281)
6 years ago
Thibaut Girka afdf1a1b15 Do not try to parse gif files as CSS or JS
6 years ago
Thibaut Girka eed61a37ec Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi e51e6ba353 Do not use @babel/preset-env to compile node_modules (#10289)
6 years ago
Nolan Lawson 11e59cab70 perf: remove stats.json generation in webpack (#10290)
6 years ago
Eugen Rochko 4fa2d55d4e Add relationship manager UI (#10268)
6 years ago
Nolan Lawson 9c2c2afd6b perf: remove zopfli to speed up webpack (#10288)
6 years ago
Yamagishi Kazutoshi e0e72c90b6 Bump webpacker from 3.5.5 to 4.0.2 (#10277)
6 years ago
Eugen Rochko 0b6bcb9384 Fix detailed poll validation errors not being returned in the API (#10261)
6 years ago
Yamagishi Kazutoshi 2f4ab8f051 Upgrade yargs to v12.0 (#9862)
6 years ago
Eugen Rochko e1130e461e Add a preferences API so apps can share basic behaviours (#10109)
6 years ago
Aditoo17 bb98b4e8f8 I18n: Update Czech translation (#10272)
6 years ago
Thibaut Girka 741766a01d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 73fb7bfa0f Admission-based registrations mode (#10250)
6 years ago
Thibaut Girka 5ce73f89f1 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka d86033c352 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
mayaeh c130aebba8 i18n: Add Japanese translations for new landing page (#10254)
6 years ago
Eugen Rochko 56822606f4 Redesign landing page (#10232)
6 years ago
Thibaut Girka bed7758022 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Sascha 291fbe21c2 config: add DB_SSLMODE for managed/remote PG (#10210)
6 years ago
Thibaut Girka 3ebbc1f017 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 1441046fdf Fix poll validation issues (#10186)
6 years ago
Thibaut Girka 9cb4a4c14e Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Marek Ľach 1ca322f241 Minor update for Slovak tr (#10181)
6 years ago
Aditoo17 2182495cc7 I18n: Update Czech pluralization (#10182)
6 years ago
Eugen Rochko 9e24d7dfa9 Weblate translations (2019-03-05) (#10180)
6 years ago
Thibaut Girka c0b876f726 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG d19c56b615 Add non-JS fallback for polls on public pages (#10155)
6 years ago
Eugen Rochko 4a3acdc916 Add polls (#10111)
6 years ago
Thibaut Girka 91934eeb74 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 892327c686 Give the `replies` collection an identifier and enable pagination (#10128)
6 years ago
Thibaut Girka 76949bc007 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 693f2353bc Add type, limit, offset, min_id, max_id, account_id to search API (#10091)
6 years ago
Aditoo17 6b1d7a36be I18n: Add language options for Kazakh and Lithuanian (#10104)
6 years ago
Eugen Rochko c6adec0c13 Weblate translations (2019-02-23) (#10103)
6 years ago
Thibaut Girka 5758ec9aeb Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 9b7de13928 Add domain search/filter to the "Federation" (/admin/instances) page (#10071)
6 years ago
Thibaut Girka c8086b6efb Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 9bf5658885 Add tight rate-limit for API deletions (#10042)
6 years ago
Aditoo17 f24e258692 I18n: Update Czech pluralization and fix some language names (#10015)
6 years ago
Thibaut Girka de60ff3809 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko d25756990a Add available locales for lv, ms, sq (#10008)
6 years ago
Eugen Rochko 87a5991846 Weblate translations (2019-02-11) (#10007)
6 years ago
Thibaut Girka 1c37ad108c Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
mayaeh 5e94fb5386 i18n: add Japanese translations (#10000)
6 years ago
Eugen Rochko 5adc3f5676 Fix URL linkifier grabbing full-width spaces and quotations (#9997)
6 years ago
rinsuki ae8392a11d Enable "displaying application used to post" setting by default (#9994)
6 years ago
mayaeh f308fb56ab Rename from instance to server. (#9938)
6 years ago
marcin mikołajczak 72f55c7cdf i18n: Update Polish translation 🇵 (#9974)
6 years ago
Eugen Rochko d2d4d38f22 Add featured hashtags to profiles (#9755)
6 years ago
Eugen Rochko 1f303e5591 Add option to overwrite imported data (#9962)
6 years ago
Jeong Arm 174fcfe6d6 Re-enable ignored translations that is needed (#7842)
6 years ago
ThibG dfb101cd45 Make displaying application used to toot opt-in (#9897)
6 years ago
Thibaut Girka aaf98669a5 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Marek Ľach 42bd0e3a51 More corrections for the Slovak translation (#9959)
6 years ago
Eugen Rochko 9cef8f1eb7 Fix link color in high-contrast theme, add underlines (#9949)
6 years ago
Marek Ľach 294a1a17d7 Update the Slovak translation (#9958)
6 years ago
Marek Ľach 435f44a8cc Distinguish error messaging for mystyped URLs and deleted accounts (#9957)
6 years ago
marcin mikołajczak c062f6033c i18n: Update Polish translation 🇵🇱 (#9945)
6 years ago
Thibaut Girka bb035bb0ab Make storing and displaying application used to toot opt-in
6 years ago
Thibaut Girka 827933cd09 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko f444306764 Remove unused locale string (#9873)
6 years ago
mayaeh da1a2d19af i18n: Update Japanese translations (#9871)
6 years ago
Eugen Rochko 39fa85a023 Weblate translations (2019-01-19) (#9867)
6 years ago
Thibaut Girka b49d415f37 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Alexander Mankuta bfb0027044 Use the bundled Capistrano version (#9855)
6 years ago
Eugen Rochko 86087f7461 Add information about how to opt-in to the directory on the directory (#9834)
6 years ago
Eugen Rochko 14d49e814a Add timeouts for S3 (#9842)
6 years ago
Eugen Rochko 4abfcbd614 Weblate translations (2019-01-17) (#9844)
6 years ago
Aditoo17 4b9297ad46 I18n: Update Czech translation (#9814)
6 years ago
Thibaut Girka a06d3a6082 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Moritz Heiber f2cefd9d73 Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819)
6 years ago
Renato "Lond" Cerqueira 7acc905604 Weblate translations (2019-01-15) (#9813)
6 years ago
Thibaut Girka a78447a6a4 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Marcin Mikołajczak 056e45a293 i18n: Update Polish translation (#9674)
6 years ago
Eugen Rochko 0cba7e7ebb Change "federation" admin UI link to point to "limited" domains (#9762)
6 years ago
Eugen Rochko c53b7fd78b Weblate translations (2019-01-08) (#9758)
6 years ago
Eugen Rochko f2ec1803cb Redesign admin instances area (#9645)
6 years ago
Eugen Rochko defe248b1c Change remote interaction dialog to use specific actions (#9743)
6 years ago
Eugen Rochko 3dc1452d35 Add missing locale strings (#9723)
6 years ago
Nolan Lawson 4fa76b21b6 Enable immutable caching for S3 objects (#9722)
6 years ago
Eugen Rochko ae1aaa3b8a Add scheduled statuses (#9706)
6 years ago
ThibG 631a91cbc0 Add quick links to the admin interface in the WebUI (#8545)
6 years ago
Eugen Rochko 1bd7044dbc Add mod and moderator to list of default reserved usernames (#9713)
6 years ago
Thibaut Girka 44f2224606 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 9244a06846 Add CSV export for lists and domain blocks (#9677)
6 years ago
Yamagishi Kazutoshi 101a46ac24 Update dependencies for Node.js (2018-12-31) (#9669)
6 years ago
Eugen Rochko 8958e58bd4 Improve admin UI for account view (#9643)
6 years ago
Aditoo17 08a7712dd3 I18n: Update Czech translation (#9644)
6 years ago
chr v1.x b659f51c43 Add local followers page to admin account UI (#9610)
6 years ago
Renato "Lond" Cerqueira a234fde3a4 Weblate translations (2018-12-27) (#9642)
6 years ago
Eugen Rochko bbf9f4f93b Add REST API for creating an account (#9572)
6 years ago
Thibaut Girka 48e6b2360d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko eb2994d454 Remove links to bridge.joinmastodon.org (non-functional) (#9608)
6 years ago
Eugen Rochko 2e0d617b8b Add moderation warnings (#9519)
6 years ago
Eugen Rochko ab443aaba8 Skip mailer job retries when a record no longer exists (#9590)
6 years ago
Thibaut Girka cabf2772ea Add a per-user setting to hide followers count
6 years ago
Thibaut Girka 20418dc7a7 Add admin setting to disable followers count
6 years ago
Renato "Lond" Cerqueira e60b59e5ca Weblate translations (2018-12-19) (#9578)
6 years ago
Thibaut Girka d53f315824 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
mayaeh 26f2c1240e Update Japanese translations. (#9574)
6 years ago
Thibaut Girka 720cb01715 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 32bd452b56 Remove "most popular" tab from profile directory, add responsive design (#9539)
6 years ago
Eugen Rochko 5397866326 Remove PostgreSQL statement timeout (#9537)
6 years ago
Thibaut Girka 04204427d0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Aditoo17 f14d8630b2 I18n: Correct pluralization of Czech (#9527)
6 years ago
Rey Tucker 56890834ab Remove form_action from CSP
6 years ago
Renato "Lond" Cerqueira d6d223c2a2 Weblate translations (2018-12-13) (#9513)
6 years ago
Eugen Rochko 7e4ce56476 Fix bootsnap cache directory being declared relatively (#9511)
6 years ago
Marcin Mikołajczak f10f88a29a i18n: Update Polish translation (#9509)
6 years ago
ThibG 5548049e71 Add admin ability to remove an user's header image (#9495)
6 years ago
ThibG 0686523e18 Add instance-wide setting to disable profile directory (#9497)
6 years ago
Yamagishi Kazutoshi e534f72da5 [i18n] Update Occitan (#9491)
6 years ago
ThibG fe40452a36 Use same CORS policy for /@:username and /users/:username (#9485)
6 years ago
Thibaut Girka b62953b3d2 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 097d866028 Add setting to not aggregate reblogs (#9248)
6 years ago
Marcin Mikołajczak 4379a39c05 i18n: Update Polish translation (#9459)
6 years ago
Eugen Rochko fd8ca11f19 Add profile directory (#9427)
6 years ago
Eugen Rochko 01861b4f8e Add database statement timeout of 60s (#9382)
6 years ago
Thibaut Girka e5aadde0d5 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 4813053e97 Preload common JSON-LD contexts (#9412)
6 years ago
Thibaut Girka d67776ac83 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Quentí d69ee38a7b [i18n] update and corrections for Occitan locale (#9404)
6 years ago
Thibaut Girka 77b9249250 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Marcin Mikołajczak cb7ecf5df8 Do not leak existence of e-mail addresses during login attempt, part 2 (#9376)
6 years ago
Marcin Mikołajczak 72ee0afe5f security/l10n [fr] do not leak registered e-mail addresses (#9375)
6 years ago
Thibaut Girka 35b6fb4e62 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 7aed0070d4 Remove unused translations (#9372)
6 years ago
Thibaut Girka 478abe3a58 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Renato "Lond" Cerqueira 13f080b204 Weblate translations (2018-11-27) (#9367)
6 years ago
Eugen Rochko 305556274a Redesign admin accounts index (#9340)
6 years ago
Thibaut Girka b7ef203fd6 Tighten CSP a bit
6 years ago
Thibaut Girka bf26c23205 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko a3f443b9c3 Improve ActiveRecord connection in on_worker_boot (#9238)
6 years ago
Thibaut Girka e18018e930 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
James Kiesel d2a9ea58da Allow joining several hashtags in a single column (#8904)
6 years ago
Thibaut Girka 33ad16faa7 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Quentí 407cab9844 [i18n] Update for Occitan (#9169)
6 years ago
Thibaut Girka fd18ed4cea Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Quentí a43fdd72ba [i18n] Update for Occitan (#9157)
6 years ago
Thibaut Girka 13ea29754d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Julian 41661248b0 Improved grammar in German translation (#9092)
6 years ago
Renato "Lond" Cerqueira e362029b5d Weblate translations (2018-10-26) (#9113)
6 years ago
Thibaut Girka c954f89bdd Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 057c91a4e2 Update i18n-tasks and change CircleCI command (#9104)
6 years ago
Thibaut Girka c32a5f86b6 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 3a115d3f49 Remove character counter from edit profile (#9100)
6 years ago
Marcin Mikołajczak 223af22b9c i18n: Update Polish translation (#9070)
6 years ago
Ben Lubar e2b221d9f1 Allow cross-origin requests to /.well-known/* URLs. (#9083)
6 years ago
Eugen Rochko e4892dca28 Add consistent interpolations check to CircleCI (#9072)
6 years ago
Eugen Rochko 7be9dfa8c6 Fix missing plural keys (#9084)
6 years ago
Thibaut Girka 46259a36d0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 40d23fc4d1 Add option to block reports from domain (#8830)
6 years ago
Eugen Rochko 9ccae7feff Add "disable" button to report screen (#9024)
6 years ago
Eugen Rochko e3b2234382 Add unread indicator to conversations (#9009)
6 years ago
Gomasy 46e3c63bb9 Add destroy_custom_emoji translation (#8997)
6 years ago
Quint Guvernator b815c8bcfc Fix some bad localization strings (#8994)
6 years ago
Julian 24b69ec045 one user i18n (#8992)
6 years ago
Thibaut Girka 8a87a1cda4 Fix deleting individual notifications from glitch-soc's web interface
6 years ago
jooops 8b1e1ea6ac fix invites in italian language (#8982)
6 years ago
mayaeh 6ea1a7f874 Fix description about custom mascot. (#8974)
6 years ago
Eugen Rochko c04048aae8 Weblate translations (2018-10-12) (#8972)
6 years ago
ThibG f8e9555e73 Add manifest_src to CSP, add blob to connect_src (#8967)
6 years ago
Eugen Rochko 3ede0e8b95 Fix missing protocol in dns-prefetch, improve code style (#8963)
6 years ago
Eugen Rochko 0dbb3a8786 Fix CSP headers blocking media and development environment (#8962)
6 years ago
ThibG 51c53e709f Set Content-Security-Policy rules through RoR's config (#8957)
6 years ago
Thibaut Girka 8cb843039c Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko ad0f37e924 Track historical space stats in PgHero to determine PostgreSQL growth (#8906)
6 years ago
Thibaut Girka f09150f2a9 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Sascha b7a337f63c add ffmpeg initializer (#8855)
6 years ago
mayaeh bcb43baf50 Add Japanese translations. (#8927)
6 years ago
Thibaut Girka 74e411f4e8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ashleyhull-versent 00d31a292c rubocop issues - Cleaning up (#8912)
6 years ago
ashleyhull-versent ea57aca5e1 Replace SVG asset with Custom mascot (#8766)
6 years ago
Eugen Rochko c9b5168ebd Add conversations API (#8832)
6 years ago
Thibaut Girka bdbbbb1bdb Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 95d977e51e Add POST /api/v1/notifications/:id/dismiss (#8905)
6 years ago
Marcin Mikołajczak 07d123fd3c i18n: Update Polish translation (#8901)
6 years ago
bsky 5569769737 Improve production build config (#8899)
6 years ago
Eugen Rochko 7635a136c9 Change documentation URL (#8898)
6 years ago
Thibaut Girka f627ea99e4 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
aus-social c883b1ffc9 lint pass 2 (#8878)
6 years ago
Eugen Rochko 48c2ab8cf5 Limit the number of people that can be followed from one account (#8807)
6 years ago
aus-social a53bcb6213 Lint pass (#8876)
6 years ago
Andreas Sander e29f71e4ea German translation issue on landingpage CTA (#8865)
6 years ago
Thibaut Girka dbc2386ed3 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
abcang 1f7c5b79c9 Fix requirie bootsnap (#8836)
6 years ago
Thibaut Girka f5eaefc485 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi 78558e5e1c Fix that Rails.cache information could not be sent via StatsD (#8831)
6 years ago
Eugen Rochko 0c47219e3a Support /.well-known/change-password (#8828)
6 years ago
Eugen Rochko 09016dbda4 Adjust bootsnap configuration for newer version (#8826)
6 years ago
Eugen Rochko 5ddcdf3753 Support min_id-based pagination in REST API (#8736)
6 years ago
Eugen Rochko ad0670fe87 Revert Font Awesome 5 upgrade (#8810)
6 years ago
Yamagishi Kazutoshi 991c4596b0 Fix broken report detail (regression from #8569) (#8795)
6 years ago
mayaeh 84bcf89764 Update the icon name changed by the Font Awesome 5. (#8776)
6 years ago
ふぁぼ原 bb8afc4608 Add a new preference to always hide all media (#8569)
6 years ago
Yamagishi Kazutoshi 150c9d1bb9 Weblate translations (2018-09-24) (#8768)
6 years ago
Eugen Rochko 497092aee0 Add nginx and systemd templates (#8770)
6 years ago
Matt Sweetman 674865731a Add user preference to always expand toots marked with content warnings (#8762)
6 years ago
ThibG 65801e94bf Fix Spanish locale broken due to translated variable name (#8754)
6 years ago
Thibaut Girka 032c98d372 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 604b17bc09 Fix Spanish locale broken due to translated variable name (#8737)
6 years ago
Thibaut Girka ae5c237607 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi f7cb4b93ac Weblate translations (2018-09-19) (#8731)
6 years ago
Marcin Mikołajczak 07cab6dab3 i18n: Update Polish translation (#8727)
6 years ago
Eugen Rochko d3105031f8 Redesign forms, verify link ownership with rel="me" (#8703)
6 years ago
mayaeh 102710034a Add japanese translations for the group reports and more. (#8696)
6 years ago
Yamagishi Kazutoshi 23ab704b2b Upgrade Babel to version 7.0.0 (#5925)
6 years ago
Yamagishi Kazutoshi 6faf7fd79d Weblate translations (2018-09-13) (#8692)
6 years ago
luzpaz 1bce70d3c7 Misc. typos (#8694)
6 years ago
Thibaut Girka ae2ffc7af1 Fix building assets in test environment
6 years ago
ThibG 28abd3f699 Fix building assets in test environment (#8691)
6 years ago
Eugen Rochko 50978383f9 Group reports by target account (#8674)
6 years ago
Thibaut Girka 4dd208f482 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Evgeny Petrov 87f294a33c RU: Translation fixes (#8652)
6 years ago
Sorin Davidoi 0b1c90bf88 feat(cookies): Use the same-site attribute to lax (#8626)
6 years ago
Aditoo17 97be484888 Add Czech language option and locale data (#8594)
6 years ago
Rey Tucker 121747b190 Add manifest_src to CSP
6 years ago
Thibaut Girka 63fe7a2d7a Allow to show a specific status in the admin interface
6 years ago
Thibaut Girka 7134c1f522 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko b7ec70d486 Redirect from old authorize_follow path (#8584)
6 years ago
Eugen Rochko 9768e9f6ab Enable ro and ta locales in Rails (#8583)
6 years ago
Eugen Rochko 64f01b2e7d Weblate translations (2018-09-02) (#8582)
6 years ago
Marcin Mikołajczak fb9fc05f0c i18n: Update Polish translation (#8581)
6 years ago
Eugen Rochko 9f4618d7a6 Weblate translations (2018-09-02) (#8577)
6 years ago
ThibG 56caf50db7 Update docker config and move some workers to different queues (#8345)
6 years ago
Evgeny Petrov 6997fe6d8a [RU] Added translation for the following sections: (#8570)
6 years ago
Eugen Rochko b59191cf68 Weblate translations (2018-09-01) (#8561)
6 years ago
Eugen Rochko 601a0dc6cc Add preference for report notification e-mails, skip for duplicates (#8559)
6 years ago
Yamagishi Kazutoshi 8a0670a54e Integrating `:one` and `:other` in ar.yml (#8555)
6 years ago
Thibaut Girka daa6110ce7 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi 699ab3075b Save button for relays translatable (#8539)
6 years ago
Yamagishi Kazutoshi 724a6fa7e4 Normalize Welsh (#8538)
6 years ago
Eugen Rochko 2eac55cb3a Add Welsh language option (#8536)
6 years ago
Eugen Rochko 7d467f38d3 Weblate translations (2018-08-31) (#8535)
6 years ago
Renato "Lond" Cerqueira c7423078ce Add animate custom emoji param to embed pages (#8507)
6 years ago
Thibaut Girka 0a841048fa Fix CSP with S3/SWIFT hosts
6 years ago
Thibaut Girka faeb568601 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 2f78bd1b42 Adjust CSP to fix image resizing
6 years ago
Eugen Rochko f507c9713f Display pending message on admin relays UI (#8494)
6 years ago
Thibaut Girka 4f4908311d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Renato "Lond" Cerqueira c13f14b627 Weblate translations (2018-08-27) (#8483)
6 years ago
M Somerville 9fe24fbf4b Better singulars of account followers/toots. (#8471)
6 years ago
Thibaut Girka ae4240d236 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 2b2045834e Revert "Default puma to running on localhost only." (#8444)
6 years ago
Eugen Rochko 660475198b Add theme identifier to body classes for easier custom CSS styling (#8439)
6 years ago
M Somerville 01896d770d Default puma to running on localhost only. (#8429)
6 years ago
Yamagishi Kazutoshi db91d0dcc7 Weblate translations (2018-08-25) (#8420)
6 years ago
M Somerville 4b27569841 Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423)
6 years ago
MIYAGI Hikaru 0985b647ee Revice Japanese translation of `deleted_status` (#8419)
6 years ago
Thibaut Girka 69212ed0ad Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 94b7dddeac Add admin custom CSS setting (#8399)
6 years ago
Thibaut Girka 36a96b33d9 Only apply CSP in production mode
6 years ago
Thibaut Girka 91c50b0d4b Tighten CSP while allowing CDN hosts
6 years ago
Sylvhem 3e3de891ac Major update for the French translation (#8348)
6 years ago
Marcin Mikołajczak 946301ea3b i18n: fix Polish translation (#8380)
6 years ago
Marcin Mikołajczak fd822430fe i18n: Update Polish translation (#8378)
6 years ago
Thibaut Girka 86d2a9d480 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 563a09d81a Move CSP headers to the appropriate Rails configuration
6 years ago
M Somerville e42c06ec01 Allow use of plurals on about page stats. (#8363)
6 years ago
Eugen Rochko 801b0f583f Add confirmation step to account suspensions (#8353)
6 years ago
Yamagishi Kazutoshi 3195c46402 Weblate translations (2018-08-22) (#8346)
6 years ago
Thibaut Girka 98dccee657 Merge branch 'master' into glitch-soc/master
6 years ago
ThibG 97f2dc6761 Revert to using Paperclip's filesystem storage, and fix dangling records in remove_remote (#8339)
6 years ago
ThibG 09fb9fb07e Add API endpoint to list featured accounts (fixes #8315) (#8317)
6 years ago
Oskari Noppa d7486781ab Fix a variable for a Finnish translation (#8299)
6 years ago
Marcin Mikołajczak e6879b490f i18n: Update Polish translation (#8290)
6 years ago
Thibaut Girka c043697caa Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 85990d2886 Link to mobile apps page (#8278)
6 years ago
Eugen Rochko 834df855e2 Add admin function to deactivate all invites (#8279)
6 years ago
Thibaut Girka 767cc06fe2 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 5c32fbce98 Add "sign in to participate" message to public toot page (#8200)
6 years ago
Eugen Rochko 273e8f0474 Add remote interaction dialog for toots (#8202)
6 years ago