1391 Commits (a1894cbc13e07773fe85b0408a80b90234e4d772)

Author SHA1 Message Date
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