1055 Commits (065a19b18bf129dac60ffec78615f4135aa2f987)

Author SHA1 Message Date
Thibaut Girka 4cb367e6d4 Merge branch 'master' into glitch-soc/merge-master
7 years ago
Jeroen daff01a5a5 Added the law requirements for the EU/EEA (#7605)
7 years ago
Thibaut Girka 28ccf0a464 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
SerCom_KC 82da8b7ec6 [WIP] i18n: Update Simplified Chinese translations (#7576)
7 years ago
Evgeny Petrov 96040c54f5 [RU] Added mastodon-light string (#7583)
7 years ago
Marcin Mikołajczak 9b1b968262 🌍: 🇵🇱⬆️ (#7580)
7 years ago
Thibaut Girka 72c454e2b3 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
SerCom_KC 8a8a47892a i18n: Update Simplified Chinese translations (#7565)
7 years ago
Sylvhem eeb6fd44e1 Add a light theme (#7027)
7 years ago
Quentí 1de642e921 [i18n] Update for Occitan (#7558)
7 years ago
Evgeny Petrov d3c01f86ba [RU] Updated strings for 2.4.0 (#7555)
7 years ago
Marcin Mikołajczak b4458906ba 🌍: 🇵🇱⬆️ (#7554)
7 years ago
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
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
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
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 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
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
Renato "Lond" Cerqueira b84b11c41a Weblate translations 20180503 (#7325)
7 years ago
Yamagishi Kazutoshi f88306e4a0 [i18n] Occitan update (#7294)
7 years ago
Marcin Mikołajczak 707213b91a 🌍: 🇵🇱⬆️ (#7275)
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
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
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
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
mayaeh a35aeefe0a i18n: Add Japanese translations for privacy policy and more (#7049)
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
Emelia Smith 765bfd0cf5 Feature: Allow staff to change user emails (#7074)
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
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
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
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 eba1b109db Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
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
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
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
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
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
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
mayaeh 8995e9238a i18n: Update Japanese translations (#6550)
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Marcin Mikołajczak 21da2f420e i18n: Update Polish translation (#6539)
7 years ago
Eugen Rochko ad1f541bd7 Redesign landing page (again) (#6486)
7 years ago
Eugen Rochko f6884555d7 Account archive download (#6460)
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
Marcin Mikołajczak 0ce908b3e0 i18n: Update Polish translation (#6470)
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
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
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
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
Renato "Lond" Cerqueira 11f970da4d Weblate translations (#6323)
7 years ago
Jeong Arm e96b90c274 Korean translation (#6322)
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
David Yip d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream
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
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
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 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 06a32b2621 Merge pull request #243 from m4sk1n/glitch-pl
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
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
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