1358 Commits (caa6611877751147d305782cd546071e52b3dcce)

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