2507 Commits (06e720418149252eeb0c0041fc8a5b981411dcb6)

Author SHA1 Message Date
Mathieu Brunot 128a7ab7eb Add an LDAP Mail attribute config (#12053)
5 years ago
Thibaut Girka 93167b3665 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Mathieu Brunot 462788cb12 Convert LDAP username (#12461)
5 years ago
Sasha Sorokin 33696a4b44 Split relationships page strings (#12502)
5 years ago
ThibG 4b0a6d79dd Add ability to filter reports by target account domain (#12154)
5 years ago
ntl-purism 58e52929be LDAP & PAM added to OAuth password grant strategy (#7999) (#12390)
5 years ago
Thibaut Girka e48f63787d Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Sasha Sorokin 67e19f7977 Improve notifications page (#12497)
5 years ago
Yamagishi Kazutoshi 4ca914f4c0 Use override_csp options on pghero (#12489)
5 years ago
Thibaut Girka 06b56ac4b7 Fix weird edge case in load_schema
5 years ago
Thibaut Girka 8a037844d5 Revert CircleCI and some webpack changes to match upstream
5 years ago
Thibaut Girka d0be1d0cde Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
dependabot-preview[bot] 1346774607 Bump webpacker from 4.0.7 to 4.2.0 (#12416)
5 years ago
Thibaut Girka 562534a9d3 Override Migrator.new instead of Migrator#initialize, it's easier to understand
5 years ago
Thibaut Girka 13f738e229 Add documentation about the migration hack
5 years ago
Thibaut Girka f046c03787 Monkey-patch Rails' migrator to ignore duplicate migrations across Mastodon and glitch-soc
5 years ago
Thibaut Girka a96375d2ef Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 25993fc00d Fix inconsistent interpolations test by ignoring single plural keys (#12394)
5 years ago
Eugen Rochko d144122718 Fix localization test failing due to order of locale definitions (#12393)
5 years ago
Eugen Rochko bf3c777751 Add kn, mr, ur to available locales (#12379)
5 years ago
Eugen Rochko 8eac21be16 New Crowdin translations (#12146)
5 years ago
ThibG 517c1cd062 Add bookmarks (#7107)
5 years ago
ThibG f73c977caa Fix broken admin audit log in whitelist mode (#12303)
5 years ago
Thibaut Girka 79b802f10c Fix build with new sass-loader
5 years ago
Thibaut Girka 09430e7028 Disable minimization in test environment
5 years ago
Thibaut Girka e7655951d7 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Yamagishi Kazutoshi fdda54272d Change message of public timeline for local only (#12224)
5 years ago
Thibaut Girka e76f4056e5 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Faye Duxovni 6bca6dbc2d Add setting for whether to crop images in unexpanded toots (#12126)
5 years ago
ThibG 17d472b91b Add link to search for users connected from the same IP address (#12157)
5 years ago
Soft. Dev 4b059fdfde change string from Disable to Disable login (#12201)
5 years ago
Thibaut Girka 9da6fc00ff Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 0ba5f2037d New Crowdin translations (#12144)
5 years ago
Eugen Rochko 5fdf430491 New Crowdin translations (#12072)
5 years ago
Eugen Rochko 84e0e916e7 Fix auto-report string saying the account has been auto-silenced (#12142)
5 years ago
Thibaut Girka 9506d9cafc Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 9f94d4ceb3 Fix preloaded JSON-LD context for identity not being used (#12138)
5 years ago
Eugen Rochko d99a6145de Remove auto-silence behaviour from spam check (#12117)
5 years ago
Eugen Rochko 2e07a901c5 Fix attachment not being re-downloaded even if file is not stored (#12125)
5 years ago
Eugen Rochko 001ce9a1a9 Add admin setting to auto-approve hashtags (#12122)
5 years ago
Eugen Rochko ca8172ee02 Remove fallback to long description on sidebar and meta description (#12119)
5 years ago
Eugen Rochko d59562c0b2 Fix S3 adapter retrying failing uploads with exponential backoff (#12085)
5 years ago
Thibaut Girka 07abea7ba8 Merge tag 'v3.0.0' into glitch-soc/merge-upstream
5 years ago
dependabot-preview[bot] 9fa40f1f0a Bump capistrano from 3.11.1 to 3.11.2 (#12012)
5 years ago
Eugen Rochko 63fe37a977 New Crowdin translations (#12067)
5 years ago
Eugen Rochko a57da77719 Remove invite comments from UI (#12068)
5 years ago
Eugen Rochko 12fef4dab0 New Crowdin translations (#12061)
5 years ago
Thibaut Girka c2d6ef1b64 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 27dff3317c Add br, es-AR, et, mk, nn to available locales (#12062)
5 years ago
Eugen Rochko 59d551093f New Crowdin translations (#12047)
5 years ago
Eugen Rochko 6152eaea04 New Crowdin translations (#11998)
5 years ago
mayaeh da68736ca3 Fix hashtag link to directory in AdminUI (#12005)
5 years ago
Eugen Rochko f77337daaf Fix records not being indexed sometimes (#12024)
5 years ago
Thibaut Girka cc94c90bf1 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG f088e090e4 Add voters count support (#11917)
5 years ago
Eugen Rochko 51a72a802f Add a nodeinfo endpoint (#12002)
5 years ago
Eugen Rochko 11e7f5936e New Crowdin translations (#11985)
5 years ago
Eugen Rochko 7b7c50f124 Fix public list of domain blocks being too verbose on about page (#11967)
5 years ago
Eugen Rochko f5c71a6cd2 Add (back) option to set redirect notice on account without moving followers (#11994)
5 years ago
Eugen Rochko acdd77b5ee New Crowdin translations (#11909)
5 years ago
mayaeh a871331a03 Add translation strings for AdminUI custom emojis (#11970)
5 years ago
Eugen Rochko 67796a267d Fix relays UI being available in whitelist/secure mode (#11963)
5 years ago
Yamagishi Kazutoshi 161b0a0958 Hide error message on /heath (#11947)
5 years ago
Yamagishi Kazutoshi 3592705de5 Cast multipart threshold to integer (#11944)
5 years ago
Eugen Rochko 3773115066 Fix authentication before 2FA challenge (#11943)
5 years ago
Yamagishi Kazutoshi 71ff422997 Add config of multipart threshold for S3 (#11924)
5 years ago
Eugen Rochko 036e851c1a New Crowdin translations (#11901)
5 years ago
Eugen Rochko f3917e433b New Crowdin translations (#11861)
5 years ago
Eugen Rochko a2d3728c36 Add account migration UI (#11846)
5 years ago
Eugen Rochko 61442032a2 Add table of contents to about page (#11885)
5 years ago
Thibaut Girka 4837d6275a Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 1781358bd9 Add password challenge to 2FA settings, e-mail notifications (#11878)
5 years ago
Eugen Rochko 0732212dbe Fix pre-review confirmation e-mail saying you can't login (#11860)
5 years ago
Eugen Rochko 722d8cdc36 New Crowdin translations (#11799)
5 years ago
mayaeh 566e85716f Add search and sort functions to hashtag admin UI (#11829)
5 years ago
Eugen Rochko 8eb0d880cb Fix 2FA challenge and password challenge for non-database users (#11831)
5 years ago
Thibaut Girka 2e38d889a3 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 8824964836 Remove deprecated `GET /api/v1/search` API (#11823)
5 years ago
Yamagishi Kazutoshi 025de313bc Change rate limit for media proxy (#11814)
5 years ago
Tao Bror Bojlén 0430cbec29 add admin setting for default search engine indexing (fix #11750) (#11804)
5 years ago
Eugen Rochko 853de72d60 New Crowdin translations (#11626)
5 years ago
Eugen Rochko 25fb124ee6 Add batch actions and categories to admin UI for custom emojis (#11793)
5 years ago
Eugen Rochko 7799c7c75f Add batch approve/reject for pending hashtags in admin UI (#11791)
5 years ago
Takeshi Umeda 50c2f0dcc1 Add featured tags API (#11778)
5 years ago
Yamagishi Kazutoshi 7544167f3c Add healthcheck endpoint for web (#11770)
5 years ago
Eugen Rochko 89989b6255 Add timeline read markers API (#11762)
5 years ago
Thibaut Girka eac7c66d2a Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
dependabot-preview[bot] 7599b4b3b6 Bump capistrano from 3.11.0 to 3.11.1 (#11731)
5 years ago
Yamagishi Kazutoshi 4f9f1c6a98 Add PERSISTENT_TIMEOUT option (#11756)
5 years ago
Eugen Rochko 7ef93513f7 Change account deletion page to have better explanations (#11753)
5 years ago
ThibG 8b271d6d25 Fix ActivityPub context not being dynamically computed (#11746)
5 years ago
Eugen Rochko feeecba886 Change OpenGraph description on sign-up page to reflect invite (#11744)
5 years ago
Hugo Gameiro 3cd3cb6a41 Add SMTP reply_to option (#11718)
5 years ago
mayaeh 80fe7fa415 Integrate translation strings for the Profile Directory. (#11722)
5 years ago
Eugen Rochko 436266ca27 Change trending hashtags to not disappear instantly after midnight (#11712)
5 years ago
Thibaut Girka 741b53651e Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko f21e27e914 Fix uncaught parameter missing exceptions and missing error templates (#11702)
5 years ago
Eugen Rochko 12eed2edd8 Fix non-GET requests to / not being matched (#11704)
5 years ago
Eugen Rochko 79922ae20f Add profile directory to web UI (#11688)
5 years ago
Thibaut Girka 449a0727a7 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
mayaeh 9676ae2219 Add translation target for hashtag (#11657)
5 years ago
Eugen Rochko 9959cdc79f Add option to include reported statuses in warning e-mail (#11639)
5 years ago
Eugen Rochko 32c781ec6b Add soft delete for statuses for instant deletes through API (#11623)
5 years ago
Thibaut Girka f82b1bb158 Fix connect-src policy for Tesseract
5 years ago
Thibaut Girka c060523dc2 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG 5a122f1450 Fix CSP needlessly allowing blob URLs in script-src (#11620)
5 years ago
Eugen Rochko cc34509d65 New Crowdin translations (#11596)
5 years ago
ThibG 867b9f3e9c Add public blocks to /about/blocks (#11298)
5 years ago
Eugen Rochko dc20e1af71 Add HTTP signature keyId to request log (#11591)
5 years ago
Eugen Rochko 87df04d94c Add trends to public pages sidebar (#11594)
5 years ago
Eugen Rochko 3dfef67643 New Crowdin translations (#11593)
5 years ago
Eugen Rochko 848cb2a697 Add more accurate hashtag search (#11579)
5 years ago
Eugen Rochko bfca519250 New Crowdin translations (#11305)
5 years ago
Eugen Rochko 8e76c759c1 Add explanation to featured hashtags page and profile (#11586)
5 years ago
Eugen Rochko b1f116335c Fix media host not being included in connect-src for OCR (#11577)
5 years ago
Eugen Rochko 41b188dce6 Add OCR tool to media editing modal (#11566)
5 years ago
Thibaut Girka 97c3cec2f8 Add option to disable emoji replacements
5 years ago
Thibaut Girka f0362fa0ee Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 32ff86b6e5 Fix crash when saving invalid domain name (#11528)
5 years ago
Thibaut Girka 81c6f2fd0e Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko cc1e24ddc7 Add breakdown of usage by source to admin UI for hashtags (#11517)
5 years ago
ThibG 072e696aa1 Add domain block notes (#11515)
5 years ago
Eugen Rochko 25f549557b Fix trending tags returning less items than requested sometimes (#11513)
5 years ago
Eugen Rochko bfb43d7104 Add number of pending accounts and pending hashtags to admin dashboard (#11514)
5 years ago
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