1862 Commits (f7a28fd46d7e0a4b3579dd2525cf2145a8e75a78)

Author SHA1 Message Date
Thibaut Girka c384e0f3de Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Yamagishi Kazutoshi 20550e2641 Weblate translations (2018-05-20) (#7552)
7 years ago
Eugen Rochko 7eaa12c83a Ensure push subscription is immediately removed when application is revoked (#7548)
7 years ago
Peter bc20c2cd3a Add :few keys for sk lang plurals (#7551)
7 years ago
Eugen Rochko 70e678da43 Improve payload format of Web Push API now that it's open (#7521)
7 years ago
David Yip 3c3e6d0e9b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko aeceb63275 Add preference to hide following/followers lists (#7532)
7 years ago
Jenkins 4a3872d26e Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
MIYAGI Hikaru 7dbf83d6b8 User agent for WebFinger (#7531)
7 years ago
Thibaut Girka 7d5dbed502 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Evgeny Petrov e503a61a5a Russian language for 2.4.0 (#7512)
7 years ago
Quentí b64100c049 [l10n] Occitan update (#7505)
7 years ago
nightpool ebce199209 Update bot preference text (#7507)
7 years ago
Marcin Mikołajczak 73f4c61bbd 🌍: 🇵🇱⬆️ (#7494)
7 years ago
Renato "Lond" Cerqueira 933f6e2ad4 Weblate translations 20180515 (#7496)
7 years ago
Thibaut Girka efd2441d1f Merge branch 'master' into glitch-soc/merge
7 years ago
Akihiko Odaki 0205536ee7 Limit environment variables to expose to webpack (#7480)
7 years ago
Yamagishi Kazutoshi 4d5bec8a75 Add Slovene language (#7475)
7 years ago
Eugen Rochko 7463d87ec3 Add GET /api/v1/push/subscription REST API (#7471)
7 years ago
ThibG 4072475241 Improvements to toots display in admin view (#7452)
7 years ago
Thibaut Girka d0b753db6b Merge branch 'master' into glitch-soc/merge
7 years ago
Eugen Rochko e86a4fe36b Add REST API for Web Push Notifications subscriptions (#7445)
7 years ago
Yamagishi Kazutoshi a6bdefe811 Weblate translations (2018-05-10) (#7438)
7 years ago
Thibaut Girka 5b46a6002f Ignore tootsuite-specific theme-related translation strings
7 years ago
Thibaut Girka af504e62ff Merge branch 'master' into glitch-soc/master
7 years ago
Marcin Mikołajczak cbb7f33083 🌍: 🇵🇱⬆️ (#7427)
7 years ago
Eugen Rochko 7ff3c849d1 Bot nameplates (#7391)
7 years ago
Hugo Gameiro 27cfb13b83 Improve OpenStack v3 compatibility (#7392)
7 years ago
Eugen Rochko 93553c17c8 Add Corsican localization (#7390)
7 years ago
Yamagishi Kazutoshi a14525d3df Weblate translations (2018-05-06) (#7381)
7 years ago
Shuhei Kitagawa 8c8a850f8a Add resend confirmation for admin (#7378)
7 years ago
Eugen Rochko a1398887ae Add hint about 7 day cooldown for archive takeout (#7375)
7 years ago
Eugen Rochko 14393f29ef Add contact e-mail hint to 2FA login form (#7376)
7 years ago
Eugen Rochko 0dcca6b6e8 Improve admin UI for accounts (#7360)
7 years ago
Reto Kromer d806eb8e59 uniform email rather than e-mail (#7373)
7 years ago
David Yip ea46024add Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko d9eda62221 Show remote reports in admin UI as coming from domain rather than user (#7347)
7 years ago
David Yip 976347fa78 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
David Yip 587c2da0cf Remove unused translations.
7 years ago
Shuhei Kitagawa 4a422a7eaa Fix 2fa description in Japanese (#7349)
7 years ago
David Yip c87f1d99e4 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Akihiko Odaki 854d974499 Add a missing question mark in rack_attack.rb (#7338)
7 years ago
Akihiko Odaki 5cddff0795 Throttle media post (#7337)
7 years ago
Yamagishi Kazutoshi 5bd8cda844 Add el and te (#7332)
7 years ago
Renato "Lond" Cerqueira b84b11c41a Weblate translations 20180503 (#7325)
7 years ago
Eugen Rochko ca1c696dbd Slightly reduce RAM usage (#7301)
7 years ago
Yamagishi Kazutoshi f88306e4a0 [i18n] Occitan update (#7294)
7 years ago
Marcin Mikołajczak 707213b91a 🌍: 🇵🇱⬆️ (#7275)
7 years ago
Eugen Rochko 0370c0f4d6 Add support for separate Redis for cache (#7272)
7 years ago
Yamagishi Kazutoshi 31af463590 Add Basque language support (#7267)
7 years ago
Renato "Lond" Cerqueira 2457b9efa0 Weblate translations 20180426 (#7266)
7 years ago
Stefan Midjich e0f6cb24db Better phrasing in swedish translation (#7263)
7 years ago
MIYAGI Hikaru 28808f638e HTTP proxy support for outgoing request, manage access to hidden service (#7134)
7 years ago
Stefan Midjich 76f1be66ee more sane phrasing in 🇸🇪 translation (#7256)
7 years ago
Renato "Lond" Cerqueira ad6a669494 Weblate translations (2018-04-24) (#7252)
7 years ago
Emelia Smith 49d9ea6998 Implement the ability for instances to define a list of disallowed hashtags (#7176)
7 years ago
Marcin Mikołajczak 52d4002f70 🌍: Make 🇵🇱 translation more consistent (#7239)
7 years ago
Yamagishi Kazutoshi e83e74f36d Update dependencies for Ruby (2018-04-23) (#7237)
7 years ago
jumoru 915ec9c988 Fix: Use "exportierten" instead of "exportieren" in translation (#7186)
7 years ago
Matthias Beyer b56a55352a Fix: Use "welches" instead of "dass" in translation (#7185)
7 years ago
Lynx Kotoura 670b5bcc6a Separate high contrast theme (#7213)
7 years ago
Eugen Rochko 354a6e4026 Improve report layout (#7188)
7 years ago
David Yip bae5435010 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Marcin Mikołajczak 7bca0f1cda i18n: Update Polish translation (#7181)
7 years ago
Kaito Sinclaire 447741e456 Direct messages column (#4514)
7 years ago
luzi82 9b80aede7a zh-HK translation (#7177)
7 years ago
Emelia Smith 0f9c6407e9 Feature: add count of account notes to reports (#7130)
7 years ago
Yamagishi Kazutoshi da5142618f Weblate translations (2018-04-15) (#7141)
7 years ago
Marcin Mikołajczak 1921384e08 i18n: Update Polish translation (#7131)
7 years ago
David Yip 9697c6d9f0 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 466442b764 Add bio fields (#6645)
7 years ago
Jenkins a1894cbc13 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip 26f770cf72 Merge remote-tracking branch 'glitchsoc/master' into gs-master
7 years ago
David Yip 605016368d Merge pull request #419 from ThibG/glitch-soc/features/bookmarks
7 years ago
David Yip fd98bfd108 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
mayaeh a35aeefe0a i18n: Add Japanese translations for privacy policy and more (#7049)
7 years ago
Yamagishi Kazutoshi 9761b940ac Upgrade Rails to version 5.2.0 (#5898)
7 years ago
David Yip ac1ac20ee9 Merge remote-tracking branch 'tootsuite/master'
7 years ago
Alexander 8a9da4c414 update gem, test pam authentication (#7028)
7 years ago
Thibaut Girka 12f8473561 Add backend support for bookmarks
7 years ago
Jenkins e4e0aa5d21 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith 5a166a19a7 Feature: Improve reports ui (#7032)
7 years ago
Eugen Rochko dbf7f62cea Use RAILS_LOG_LEVEL to set log level of Sidekiq, too (#7079)
7 years ago
Emelia Smith 765bfd0cf5 Feature: Allow staff to change user emails (#7074)
7 years ago
Eugen Rochko 8af5b4ed4b Log rate limit hits (#7096)
7 years ago
Marcin Mikołajczak 33671bcc50 i18n: Update Polish translation (#7085)
7 years ago
David Yip 337fc136fd Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ThibG a91acd2010 Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)
7 years ago
Eugen Rochko a814aa8e4d Add a circuit breaker for ActivityPub deliveries (#7053)
7 years ago
Hisham Muhammad 835a974a2a i18n: improve "Welcome" translation in Portuguese (#7068)
7 years ago
Eugen Rochko e54b79a777 Adjust privacy policy (#6666)
7 years ago
David Yip a60a600a10 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Marcin Mikołajczak db2e7649ed i18n: Update Polish translation (#7037)
7 years ago
Eugen Rochko 7f1e924fa9 Add contact account to landing page ("Administered by") (#6984)
7 years ago
Jenkins 62ce70f28c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 9b449c6001 Fix french wording of reblogged toots in public views, matching the wording of reblogged_by (#7029)
7 years ago
mayaeh b505eec7e5 i18n: Add Japanese translations for #7000 (#7022)
7 years ago
Emelia Smith 5373b138e8 Feature: Report improvements (#6967) (#7000)
7 years ago
Emelia Smith 0408944627 Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)
7 years ago
Yamagishi Kazutoshi 21fa7b6520 Weblate translations (2018-04-02) (#7007)
7 years ago
Evgeny Petrov 2964c7a7b8 Russian language updated (#7005)
7 years ago
luzi82 89d3bc36a3 i18n: update zh-HK translation (#7004)
7 years ago
David Yip 21394c5462 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
luzi82 3233c46796 improve zh-HK localization by referring zh-TW and zh-CN (#6988)
7 years ago
David Yip 2567d0a704 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Akihiko Odaki e829c21cc6 Cache media (#6902)
7 years ago
Jenkins ae55717f50 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Marcin Mikołajczak 29dfe740f6 i18n: Update Polish translation (#6903)
7 years ago
Yamagishi Kazutoshi 6daa722e87 Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807)" (#6808)
7 years ago
Akihiko Odaki 9125608145 Note if the user is already following the target when authorizing follow (#6325)
7 years ago
Jeroen 0bedd0bb45 Invites: Add '1 week' as expire option (#6872)
7 years ago
Yamagishi Kazutoshi ed074766aa Weblate translations (2018-03-23) (#6874)
7 years ago
Jenkins 60eafb173f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quentí a8c2ce486f [i18n] Occitan update (#6869)
7 years ago
Jenkins b1453c0dbf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 59b3b38b0e Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845)
7 years ago
Akihiko Odaki a4d7afa3d9 Fix i18n fallback configuration conflicts with environment configurations (#6843)
7 years ago
Jenkins eba1b109db Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Alexander af08f6042d rename pam email environment variable to something more understandable and default to LOCAL_DOMAIN (better fallback) (#6833)
7 years ago
Alexander 4fc9827b69 bugfixes and gem update (#6831)
7 years ago
Renato "Lond" Cerqueira 9bdedcfa48 Weblate translations 20180319 (#6827)
7 years ago
David Yip b0993a5fdf Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko b95c3ef3ee Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)
7 years ago
Eugen Rochko d35272245e Revert "Upgrade Paperclip to version 6.0.0" (#6807)
7 years ago
Yamagishi Kazutoshi cd6dee83a1 Upgrade Paperclip to version 6.0.0 (#6754)
7 years ago
Jenkins dd0dafed03 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Renato "Lond" Cerqueira b83c1d7c5d Weblate translations (2018-03-13) (#6777)
7 years ago
David Yip 9ca0336c15 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi 8d6d74b319 Weblate translations (2018-03-11) (#6742)
7 years ago
Jenkins af2b57a054 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi aff19f5f10 Change avatar size on form hints (#6707)
7 years ago
Renato "Lond" Cerqueira 48b2a6f08d Weblate translations (2018-03-09) (#6708)
7 years ago
Jenkins 54608d0486 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko f67fe3ebe8 Improve styling of closed registrations message, rename button (#6695)
7 years ago
Yamagishi Kazutoshi b2b7333b26 Weblate translations (2018-03-08) (#6690)
7 years ago
Effy Elden 4a8046df66 Add additional first_name and last_name SAML attribute statement options, and modify Omniauthable concern to use full_name or first_name + last_name if not available (#6669)
7 years ago
Sylvhem 18d4e03e6b Add headings to the security settings page (#6661)
7 years ago
Renato "Lond" Cerqueira 1f328e22a0 Weblate translations (05-03-2018) (#6640)
7 years ago
Marcin Mikołajczak 6fee779fa6 i18n: Update Polish translation (#6632)
7 years ago
Akihiko Odaki 649565e005 Provide default OTP_SECRET value for development environment (#6617)
7 years ago
Akihiko Odaki 008bc9f47d Set the default locale in config (#6580)
7 years ago
Eugen Rochko b1f8dfd3cf Federate pinned statuses over ActivityPub (#6610)
7 years ago
Jeong Arm 58d54489c6 Translate Korean (#6608)
7 years ago
David Yip c08c971dd3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi 1fad0489eb Change "or" translatable (#6597)
7 years ago
Alexander 988f6505e4 fix logic for pam_controlled_service (#6599)
7 years ago
Yamagishi Kazutoshi 38f0d2f88b Weblate translations (2018-03-02) (#6588)
7 years ago
mayaeh 6b751679b5 i18n: Update Japanese translations (#6581)
7 years ago
Marcin Mikołajczak a6d10b05f6 i18n: Update Polish translation (#6578)
7 years ago
Eugen Rochko 9721b7746a Fix #942: Seamless LDAP login (#6556)
7 years ago
beatrix caa0e2e2f8 remove Uglifier call from production.rb (#6568)
7 years ago
imncls 76aef54e8e i18n normalize data
7 years ago
Ian McCowan 88461c1abe Fix prev/next links on public profile page (#6497)
7 years ago
imncls 76e0b69e02 Add missing Japanese translate
7 years ago
Akihiko Odaki a5a434a8f6 Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)
7 years ago
mayaeh 8995e9238a i18n: Update Japanese translations (#6550)
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Ghislain Loaec d1806f5dc4 New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML strategies) (#6540)
7 years ago
Marcin Mikołajczak 21da2f420e i18n: Update Polish translation (#6539)
7 years ago
Ghislain Loaec deea524052 New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED + fixes #6533 (#6538)
7 years ago
Eugen Rochko ad1f541bd7 Redesign landing page (again) (#6486)
7 years ago
Eugen Rochko f6884555d7 Account archive download (#6460)
7 years ago
Eugen Rochko c34ff9fb82 Fix avatar and header issues by using custom geometry detector (#6515)
7 years ago
Eugen Rochko 2815ef6d7f Fix #6509: Use pull queue for chewy jobs (#6513)
7 years ago
Jenkins e768ef35b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki ca6c8b92d9 Isolate each specs for cache store (#6450)
7 years ago
David Yip 596deb050b Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Simó Albert i Beltran 056f153077 Fix Spanish translation of remote_follow acct (#6475)
7 years ago
Simó Albert i Beltran 23089a38ee Fix Catalan translation of remote_follow acct (#6476)
7 years ago
Eugen Rochko 9b7490cede Save video metadata and improve video OpenGraph tags (#6481)
7 years ago
Marcin Mikołajczak 0ce908b3e0 i18n: Update Polish translation (#6470)
7 years ago
Jenkins bcd435effe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Daniel King 845ea13622 Fix URLs incorrectly having trailing hyphen removed (#6465)
7 years ago
Eugen Rochko cd925c11e3 Fix Chewy trying to update index with the wrong strategy (#6464)
7 years ago
Jenkins 3a1f58e9eb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 7ca5a06505 Full-text search for authorized statuses (#6423)
7 years ago
David Yip 7d67b36ba0 Normalize simple_form.en.yml.
7 years ago
David Yip 799b205766 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 219b28e172 Add preference to always display sensitive media (#6448)
7 years ago
David Yip 4f8122a98c Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 555e7205da Make PAM gem optional, allow configuration over environment (#6415)
7 years ago
Renato "Lond" Cerqueira 6528c0c101 Add option to show only local toots in timeline preview (#6292)
7 years ago
Eugen Rochko 5322013f25 CAS + SAML authentication feature (#6425)
7 years ago
beatrix d3e325e047 change referrer policy to same-origin
7 years ago
David Yip 6d1023b2e9 Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Alexander 23ce0c86da pam authentication (#5303)
7 years ago
Jenkins 52d4b56065 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Evgeny Petrov 950689c381 Russian language updated (#6397)
7 years ago
David Yip 87517e2dd8 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9c212f0f28 ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)
7 years ago
Renato "Lond" Cerqueira f9708e4cb4 Weblate translations (#6370)
7 years ago
Quenty31 1eaa2ead85 l10n Occitan update (#6367)
7 years ago
Jenkins 3cd4a0804b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quenty31 cd18b23226 l10n Occitan language update (#6346)
7 years ago
Eugen Rochko 8f60c22ba4 Fix #6311: Replace relative URLs in CSS only for Premailer (#6335)
7 years ago
Renato "Lond" Cerqueira 11f970da4d Weblate translations (#6323)
7 years ago
Jeong Arm e96b90c274 Korean translation (#6322)
7 years ago
David Yip db052e79ad Merge remote-tracking branch 'origin/master' into merge-upstream-20180121
7 years ago
Norayr Chilingarian 62e47f7041 armenian translations initial commit (#6320)
7 years ago
David Yip a95ca95b7b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
ThibG 55567d05b2 Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319)
7 years ago
David Yip 03f157f6da Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
SerCom_KC d26ae4a147 Update Simplified Chinese translations (#6306)
7 years ago
Eugen Rochko 896cadceed Improve HTML e-mails based on Litmus tests (#6301)
7 years ago
David Yip d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi 49b76b3025 Change belongs_to_required_by_default to true (#5888)
7 years ago
Marcin Mikołajczak a34f6ba630 i18n: Update Polish translation (#6297)
7 years ago
Eugen Rochko b0f2bff481 Replace tutorial modal with welcome e-mail (#6273)
7 years ago
David Yip b1155460ba Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Renato "Lond" Cerqueira 4f86722a65 Weblate translations (#6284)
7 years ago
Jenkins 8c41fb4acc Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC 350f65a6ef Update Simplified Chinese translations (#6280)
7 years ago
Jeong Arm 6892cca838 Korean translate (#6277)
7 years ago
mayaeh ef20e5d3fd Change mailer image url (#6279)
7 years ago
Eugen Rochko 000b0baac2 HTML e-mails for NotificationMailer (#6263)
7 years ago
SerCom_KC 172a88c444 Change disclaimer in email according to #5817 (#6266)
7 years ago
David Yip de7283a318 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 9613c3238c HTML e-mails for UserMailer (#6256)
7 years ago
Jenkins 6e821c4273 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 2a27afc656 Suppress CSRF token warnings (#6240)
7 years ago
Jeong Arm a12834a2c0 Add some browsers (#6246)
7 years ago
Eugen Rochko 67ee638c28 Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252)
7 years ago
Marcin Mikołajczak 6be6f6f5bd i18n: Update Polish translation
7 years ago
David Yip 1a7f8eb723 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko b7b0f630a0 Increase rate limit on protected paths (#6229)
7 years ago
Evgeny Petrov 223be1e1b2 Russian language update (#6227)
7 years ago
Jenkins a6ef3cde8e Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Renato "Lond" Cerqueira 164ec8297f Weblate translations (#6228)
7 years ago
Jenkins 1f469edac1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko c8f0be1d6d Revert #5772 (#6221)
7 years ago
Jenkins 8704a190c0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC 154bd8db56 Update Simplified Chinese translations (#6215)
7 years ago
beatrix-bitrot 6a5b778bb8 tighten csp
7 years ago
Jenkins 86007e913d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Naoki Kosaka 3bc13de62f Fix enforce HTTPS in production. (#6180)
7 years ago
beatrix 06a32b2621 Merge pull request #243 from m4sk1n/glitch-pl
7 years ago
Yamagishi Kazutoshi 0fa691d2a9 Fix RFC 5646 Regular Expression (#6190)
7 years ago
Jenkins 796a39a283 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Branko Kokanovic fb3a2ddd24 Small translation fixes for Serbian (and sr@Latn too) (#6188)
7 years ago
Marcin Mikołajczak 1f2034932b i18n: Update Polish translation (#6176)
7 years ago
Marcin Mikołajczak 1ba0732b82 i18n: Update Polish translation
7 years ago
muan 22e3acfd56 Improve Traditional Chinese translation (#6166)
7 years ago
Jenkins a7b8cb9493 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quenty31 bd82de325e l10n OC language (#6169)
7 years ago
Akihiko Odaki 7a0479c830 Allow to dereference Follow object for ActivityPub (#5772)
7 years ago
Marcin Mikołajczak b83fb8b107 i18n: Update Polish translation (#6168)
7 years ago
Yamagishi Kazutoshi d50d61a90c Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)
7 years ago
Jenkins b42e6973a1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 3c20cfd734 Add confirmation step for email changes (#6071)
7 years ago
Branko Kokanovic 1c4142da5b Adding Serbian latin translations (#6146)
7 years ago
Jenkins 5975446002 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Branko Kokanovic 34a90dc266 Adding Serbian translation (#6133)
7 years ago
David Yip 01f91695f5 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Jeong Arm fc8c2c9b4a Translate Korean (#6131)
7 years ago
Eugen Rochko 9427823d5c Add more instance stats APIs (#6125)
7 years ago
Jenkins 9ccad78647 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
nightpool e921778dd3 enforce LOCAL_HTTPS=true in production (#6061)
7 years ago
beatrix 894e9747b7 Merge pull request #274 from glitch-soc/fix-packs-on-2fa-pages
7 years ago
David Yip 136bc872b3 Remove themes.default from i18n-tasks unused check
7 years ago
David Yip df1478e313 Remove unused themes.default key in ko locale.
7 years ago
Jenkins 034617cac1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Jeong Arm 7df9864429 Update Korean translation (#6050)
7 years ago
Jenkins 9dd76b5b41 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Peter c9c63c2232 Add Slovak translation (#6052)
7 years ago
Jenkins 601f0fe4a3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC 19a2ed9a04 Improve Chinese (Simplified) Translations (#6024)
7 years ago
Jeroen 0cadfd35a5 Last minute Dutch string updates (#6025)
7 years ago
Jenkins 1366e96a02 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quenty31 10c0745c8f l10n OC and FR updates (#6017)
7 years ago
Olivier Humbert 9b24e2ef34 Update FR translation (#6012)
7 years ago
Eugen Rochko d4d0befb4b Weblate translations (#6011)
7 years ago
SerCom_KC 9bef4eb4c0 Update Chinese (Simplified) translations (#6005)
7 years ago
Eugen Rochko d6088c5308 Add filters to admin UI for custom emojis (#6003)
7 years ago
Yamagishi Kazutoshi 9dcead778c Change streaming API URL when remote development (#5942)
7 years ago
Eugen Rochko aea3d0814b Clean up admin UI for accounts (#6004)
7 years ago
Eugen Rochko 4e780addd3 Shorten English title for 2FA to avoid line-break (#6001)
7 years ago
Quenty31 84de19e1fd Update: #5985 and #5817 (#5996)
7 years ago
SerCom_KC e6bed2dd1e Update Chinese (Simplified) translations (#5991)
7 years ago
beatrix 82ec368680 Merge pull request #264 from KnzkDev/add-ja
7 years ago
David Yip ec9670a306 Remove themes.default from nl and pt-BR locales.
7 years ago
David Yip a56c9ac5dc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
ncls7615 a559a2cc9d add ja for fav conf
7 years ago
Eugen Rochko d5f4baf720 Improve public status page title (#5985)
7 years ago
Eugen Rochko 7f286d1af0 Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)
7 years ago
Quenty31 f75a91716b Tiny little change (#5981)
7 years ago
kibigo! 1d7b78817a Fixed index in webpack config
7 years ago
ncls7615 96a7247e9c add ja
7 years ago
Eugen Rochko 31fe0d067b Apply a 25x rate limit by IP even to authenticated requests (#5948)
7 years ago
kibigo! 901c08a999 Moved flavour UI into own prefs tab
7 years ago
Sylvhem e38b8c980f Change the disclaimer under the sign up form (#5817)
7 years ago
cwm 34630e00cb pulled master, moved locale entry to new location
7 years ago
kibigo! ea3154176e Removed MORE theme localizns
7 years ago
kibigo! b27126f1d6 Linting fixes
7 years ago
kibigo! 99e8710095 Javascript intl8n flavour support
7 years ago
kibigo! f0c12b28fd Removed unused theme localization key
7 years ago
kibigo! f4c233f59f Ruby intl8n for themes
7 years ago
goofy-bz 9becc9b0fe Update devise.fr.yml (#5963)
7 years ago
Quenty31 7f56924d71 l10n i18n OC: corrections (#5962)
7 years ago
Yamagishi Kazutoshi 07030db7ad Add Galician language support (#5955)
7 years ago
ButterflyOfFire d095955705 Create activerecord.ar.yml (#5951)
7 years ago
cwm 38a5aa6c9e ran i18n-tasks normalize for simple_form.en.yml
7 years ago
cwm 41bbfeec7c add initial components based off of tootsuite pr #1507
7 years ago
Eugen Rochko 2a8ab39a06 Weblate translations (#5946)
7 years ago
Naoki Kosaka 77660c4624 Missing require 'authorization_decorator'. (#5947)
7 years ago
Eugen Rochko 87af0bf6cf Rate limit by user instead of IP when API user is authenticated (#5923)
7 years ago
SerCom_KC b14983a2a4 Update Chinese (Simplified) translations (#5937)
7 years ago
Quenty31 5c12b555b4 l10n i18n OC update (#5939)
7 years ago
THE BOSS ♨ 33b40397f8 Fix typo in paperclip.rb (#5936)
7 years ago
Eugen Rochko f16141ebac Limit users to 50 lists, remove pagination from lists API (#5933)
7 years ago
Yamagishi Kazutoshi f76681ebd6 Revert fog-aws (ref #5604) (#5934)
7 years ago
Jenkins c6572ed6c8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko bcba7bba2d Weblate translations (#5922)
7 years ago
kibigo! e614dc144e Fixed webpack skin folder globbing
7 years ago
SerCom_KC d0875b6a93 Improve Chinese (Simplified) translations (#5911)
7 years ago
Quenty31 57e0d88c19 OC language update (#5905)
7 years ago
Jenkins 33fc1fbe2a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
beatrix f0b37f92a9 Merge pull request #229 from glitch-soc/glitch-theme
7 years ago
nightpool df636e03c8 fix weblate for ja (#5906)
7 years ago
David Yip bb1b4b2967 Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
NCLS 1ad81d38a6 Update ja.yml
7 years ago
Jenkins a3a7b6a848 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Marcin Mikołajczak e3422e363b i18n: 🇵🇱 (#5903)
7 years ago
Eugen Rochko b037fbf9f4 Remove rabl dependency (#5894)
7 years ago
SerCom_KC 125ad3e931 Update Chinese (Simplified) translations for version 2.1.0rc1 (#5849)
7 years ago
kibigo! fd7be49523 Various fixes
7 years ago
David Yip 1221e3075d Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo! 935946020f Fixed a name + localizations
7 years ago
kibigo! 882055afd0 Rename themes -> flavours ? ?
7 years ago
Jenkins 822dea26c3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
mayaeh ce44b3b17a Add Japanese translations for invite filter. (#5869)
7 years ago
Marcin Mikołajczak c2f8e326cc i18n: 🇵🇱 (#5865)
7 years ago
Yamagishi Kazutoshi 1447ef1d44 Add invite filter (#5862)
7 years ago
kibigo! 36b9f4df56 Skins support
7 years ago
Jenkins e8446e3724 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Marcin Mikołajczak b95f1b130a i18n: 🇵🇱 (#5851)
7 years ago
mayaeh 598be148e7 Update Japanese translations. (#5844)
7 years ago
David Yip cad2e7773c Normalize pl translation.
7 years ago
David Yip a1d9c68198 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi d6846dce20 Show "expired" in invite index (#5838)
7 years ago
nullkal 35e3791ba4 Fix account migration feature (#5837)
7 years ago
Marcin Mikołajczak 5f51992e16 i18n: 🇵🇱 (#5841)
7 years ago
David Yip bc10a0dced Merge remote-tracking branch 'tootsuite/master'
7 years ago
David Yip bc9fd8e05a Normalize config/locales/en.yml.
7 years ago
Eugen Rochko 55d9abcceb Add UI for setting up account migration (#5832)
7 years ago
Jenkins 36452d6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
mayaeh 37f152b347 i18n: Update ja translation for consumable invites. (#5829)
7 years ago
David Yip c9dd67a733 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko bc8c951083 Add consumable invites (#5814)
7 years ago
Jenkins f504ac4ff6 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
spla eddbf2e485 Updated Catalan strings (#5801)
7 years ago
Jenkins 7fcbe5faee Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 6a6e49d032 Change navigation link for moderators (#5812)
7 years ago
mayaeh 9a930c0623 i18n: Update ja translations (#5804)
7 years ago
Jenkins 359ba16721 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko efc97d404c Add logging of admin actions (#5757)
7 years ago
Jenkins 96302f7fd4 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC 97bb620b48 i18n: (zh-CN) Add translations for #5746 & #5735 (#5764)
7 years ago
kibigo! eadf1c38a5 Minor fixes
7 years ago
Jenkins a2e4d79b1c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
mayaeh 9841d20c97 Add Japanese translations. (#5769)
7 years ago
Marcin Mikołajczak 00be86c25d i18n: Update Polish translation - back-end (#230)
7 years ago
Joan Montané daec402a58 Update and fix Catalan translation (#5773)
7 years ago
kibigo! 8aeda4f064 Finalized theme loading and stuff
7 years ago
David Yip 1dc24ece41 Merge remote-tracking branch 'tootsuite/master'
7 years ago
mayaeh 52111769d0 i18n: Update ja translation for moderator badge. (#5731)
7 years ago
Lynx Kotoura 8a8bea2e53 Remove translations of default theme (#5741)
7 years ago
Yamagishi Kazutoshi bffc1b880b Add “staff” badge to admin user pages (#5735)
7 years ago
beatrix 34ba45e47c Merge pull request #226 from glitch-soc/glitch-theme
7 years ago
Marcin Mikołajczak 1f5f446f08 i18n: Update Polish translation (#5749)
7 years ago
Eugen Rochko b89f614bd7 Profile redirect notes (#5746)
7 years ago
Jenkins cea7dec340 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC e618b6c136 Updating Chinese (Simplified) translations (#5725)
7 years ago
kibigo! b8fdcfd55e Sets default theme to glitch
7 years ago
David Yip f1279d8ff3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko e149067561 Lists (#5703)
7 years ago
kibigo! 5845057adb Themed prefetching
7 years ago
David Yip 5f689cdf78 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi b80a35092e Redirect to reports when moderator (#5733)
7 years ago
Eugen Rochko 21d01d5809 Display moderator badge (green), admin badge changed to red (#5728)
7 years ago
Surinna Curtis 02ae609d9a Merge tootsuite/master at ab48f2b239
7 years ago
mayaeh 7ffee9cc9d Add Japanese translation for DM block option. (#5704)
7 years ago
Eugen Rochko a71791e3f1 Allow specifying STATSD_NAMESPACE (#5700)
7 years ago
Eugen Rochko 80873c1134 Add option to block direct messages from people you don't follow (#5669)
7 years ago
SerCom_KC 66a0141691 Updating Chinese (Simplified) translations (#5643)
7 years ago
Marcin Mikołajczak fa89e5d911 i18n: Update Polish translation (#5699)
7 years ago
mayaeh 5aca968bb7 Add Japanese translations for moderator roles and its own admin actions. (#5689)
7 years ago
Marcin Mikołajczak 57ea54ba00 i18n: fix typo in Polish translation (#5688)
7 years ago
Anna e só c4c9003f84 l10n: PT-BR translation updated (#5681)
7 years ago
KEINOS e6285715d1 Fix #5652 - Notify too short when abbrev in JA (#5664)
7 years ago
Marcin Mikołajczak df48eaec32 i18n: Update Polish translation (for #5635) (#5661)
7 years ago
Eugen Rochko 97178b6d86 Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
Matt 826dc9ee46 Update en.yml (#5648)
7 years ago
Marcin Mikołajczak 5e43ce1fcb i18n: Update Polish translation (#5639)
7 years ago
nullkal a12cc41dd4 Translate ja (#5637)
7 years ago
Quenty31 a7db7bdd96 i10n OC: Memorial (#5615) + #5467 (#5623)
7 years ago
Eugen Rochko 7f1a0241c1 Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
MitarashiDango 7a5fb781ce Fix spell miss (SWIIFT_OBJECT_URL -> SWIFT_OBJECT_URL) (#5617)
7 years ago
nullkal 19f82492ab Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)
7 years ago
Yamagishi Kazutoshi a624688ebd Unify file upload to using fog (#5604)
7 years ago
Marcin Mikołajczak a0e1e14a90 i18n: Improve Polish translation (#5596)
7 years ago
Yamagishi Kazutoshi f0d800d9a9 Update extract-text-webpack-plugin to version 3.0.2 (#5584)
7 years ago
beatrix 0daa95befb add memorial to production.rb
7 years ago
Quenty31 b6f057365d l10n Occitan (#5586)
7 years ago
MitarashiDango 3068add21d add account search condition (instance domain) (#5577)
7 years ago
Yamagishi Kazutoshi 395a88eb5d Upgrade compression-webpack-plugin to version 1.0.1 (#5581)
7 years ago
Nolan Lawson ba22580c06 Add ServiceWorker caching for static assets (#5524)
7 years ago
Yamagishi Kazutoshi 10b30bd94e Update dependencies for Ruby (2017-10-30) (#5566)
7 years ago
SerCom_KC 282f0d7479 Updating Chinese (Simplified) translations (#5508)
7 years ago
Alda Marteau-Hardi 29559b2e7a Fix a grammatical error in the notifications. (#5555)
7 years ago
Marcin Mikołajczak dc5053109b i18n: Update Polish translation (#5547)
7 years ago
Akihiko Odaki 38d5aa3073 Use contenthash for ExtractTextWebpackPlugin (#5462)
7 years ago
David Yip 2aec3c073b Merge branch 'master' into gs-master
7 years ago
nullkal 0a9cc96cdc Feature: Unlisted custom emojis (#5485)
7 years ago
beatrix ce738197b9 Merge pull request #179 from glitch-soc/keyword-mute
7 years ago
David Yip eef50289c6 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
Jenkins cfc46d7334 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Ratmir Karabut 51d4add08d Update Russian translation (#5517)
7 years ago
Anna e só 93255b003f l10n: PT-BR translation updated (#5530)
7 years ago
Matthew Walsh 737ab88c86 Added a timeline for Direct statuses
7 years ago
David Yip 4ab1534f6c Address unused translation errors.
7 years ago
David Yip e3f5ec2652 Fill in create, edit, update, and destroy for keyword mutes interface.
7 years ago
David Yip 018657a0e0 Spike out index and new views for keyword mutes controller.
7 years ago
David Yip ebfec40698 Set up /settings/keyword_mutes. #164.
7 years ago
David Yip dd4f9f18cb Merge tag 'v2.0.0' into gs-master
7 years ago
Håkan Eriksson ecef91e5ca Some typos and supplementation in sentence structures (#5441)
7 years ago
Jeroen 6235b8a8b1 Dutch: A few strings I found last minute (#5440)
7 years ago
JeanGauthier a18201f690 i18n better wording (OC/CA/FR) + string added in FR (#5438)
7 years ago
Jakob Kramer 15ae7fe6b2 Update German translation (#5425)
7 years ago
Yamagishi Kazutoshi d7063885bc Add Japanese translations (#5427)
7 years ago
Yamagishi Kazutoshi 5e6b51e2c9 Normalize locale files (#5429)
7 years ago
masarakki f76a224328 use-DB_NAME-in-development (#5430)
7 years ago
Håkan Eriksson c06052b7cf Swedish translation (#5406)
7 years ago
Jeroen 289723dd1c Small update Dutch (nl) strings (#5424)
7 years ago
David Yip e19bc7835a Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
Marcin Mikołajczak 8953c2a918 i18n: Update Polish translation (#5416)
7 years ago
JeanGauthier c102025e2c i18n ultim hour «More» dropdown title + reduce motion (#5415)
7 years ago
Nolan Lawson a54c272a1f Add option to reduce motion (#5393)
7 years ago
David Yip ec18363c3b Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
voidSatisfaction 23dad325da Add up-to-date korean translation on serverside (#5400)
7 years ago
JeanGauthier 2b099f9f2e l10n Occitan: finishing touches (#5404)
7 years ago
Yannick A c03e2d7c51 Update French translation (#5401)
7 years ago
spla 9fc9d3554d Updated Catalan strings (#5323)
7 years ago
Yannick A 7b717319f6 Update French translation (#5384)
7 years ago
Masoud Abkenar 5c26c3062d l10n: update Persian translation for 2.0 (#5391)
7 years ago
Mathias B 1df10e26a8 Correct some misspellings (#5381)
7 years ago
Anna e só 02d14fd373 l10n: PT-BR translation updated (#5362)
7 years ago
Jeroen 682bf2d624 Updating more Dutch strings for 2.0 (#5359)
7 years ago
Alda Marteau-Hardi dfde574160 Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350)
7 years ago
JohnD28 77cd62882b Update fr.yml (#5330)
7 years ago
David Yip 7d0cf5a6a1 Merge tag 'v2.0.0rc2' into gs-master
7 years ago