1382 Commits (763cda91a83dd7e3eea7afb2dbe1ff149d849b87)

Author SHA1 Message Date
Jenkins 33c2bbdda7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith d9b62e34da Feature: Improve reports ui (#7032)
7 years ago
Eugen Rochko 49bbef1202
Use RAILS_LOG_LEVEL to set log level of Sidekiq, too (#7079)
7 years ago
Emelia Smith 219a4423d8 Feature: Allow staff to change user emails (#7074)
7 years ago
Eugen Rochko 80a944c882
Log rate limit hits (#7096)
7 years ago
Marcin Mikołajczak 07d90b0414 i18n: Update Polish translation (#7085)
7 years ago
David Yip 67e77f230e
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ThibG 1364e9e4ae Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)
7 years ago
Eugen Rochko d4de2239b0
Add a circuit breaker for ActivityPub deliveries (#7053)
7 years ago
Hisham Muhammad 4a9becfca2 i18n: improve "Welcome" translation in Portuguese (#7068)
7 years ago
Eugen Rochko f1867a7388
Adjust privacy policy (#6666)
7 years ago
David Yip 3ab6a8b8be
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Marcin Mikołajczak 1c1042556d i18n: Update Polish translation (#7037)
7 years ago
Eugen Rochko 07176fed37
Add contact account to landing page ("Administered by") (#6984)
7 years ago
Jenkins 6611100480 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG d8d4217959 Fix french wording of reblogged toots in public views, matching the wording of reblogged_by (#7029)
7 years ago
mayaeh 1c293086a1 i18n: Add Japanese translations for #7000 (#7022)
7 years ago
Emelia Smith e85cffb236 Feature: Report improvements (#6967) (#7000)
7 years ago
Emelia Smith e7a1716701 Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)
7 years ago
Yamagishi Kazutoshi 3f51c6efaa Weblate translations (2018-04-02) (#7007)
7 years ago
Evgeny Petrov b04f73ce66 Russian language updated (#7005)
7 years ago
luzi82 24611d8deb i18n: update zh-HK translation (#7004)
7 years ago
David Yip eb39db7f93
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
luzi82 993ce0e5a7 improve zh-HK localization by referring zh-TW and zh-CN (#6988)
7 years ago
David Yip d2cdc2b5a3
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Akihiko Odaki ca42f9b0eb Cache media (#6902)
7 years ago
Jenkins 837b3804bf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Marcin Mikołajczak 85a395fab6 i18n: Update Polish translation (#6903)
7 years ago
Yamagishi Kazutoshi 28384c1771 Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807)" (#6808)
7 years ago
Akihiko Odaki fa310695fa Note if the user is already following the target when authorizing follow (#6325)
7 years ago
Jeroen 580835ab69 Invites: Add '1 week' as expire option (#6872)
7 years ago
Yamagishi Kazutoshi 65c10c0bc8 Weblate translations (2018-03-23) (#6874)
7 years ago
Jenkins 03b2f701e7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quentí ecdc5957a3 [i18n] Occitan update (#6869)
7 years ago
Jenkins e8aeec4fea Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko ac49c7932d
Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845)
7 years ago
Akihiko Odaki 61dcb686a8 Fix i18n fallback configuration conflicts with environment configurations (#6843)
7 years ago
Jenkins df70571bfe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Alexander 33ee347c99 rename pam email environment variable to something more understandable and default to LOCAL_DOMAIN (better fallback) (#6833)
7 years ago
Alexander 0306e3e9be bugfixes and gem update (#6831)
7 years ago
Renato "Lond" Cerqueira f7c46fc113 Weblate translations 20180319 (#6827)
7 years ago
David Yip ab04be2f84
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko a568e3ca8e
Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)
7 years ago
Eugen Rochko 40871caa4b
Revert "Upgrade Paperclip to version 6.0.0" (#6807)
7 years ago
Yamagishi Kazutoshi b88fcd53f7 Upgrade Paperclip to version 6.0.0 (#6754)
7 years ago
Jenkins d75a6054a0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Renato "Lond" Cerqueira 03119c857b Weblate translations (2018-03-13) (#6777)
7 years ago
David Yip f8e934f955
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi 8b14726f5b Weblate translations (2018-03-11) (#6742)
7 years ago
Jenkins e553905ba7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago