1348 Commits (58eeb92755c1dd81fb7481484084890cb4698f4d)

Author SHA1 Message Date
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
Yamagishi Kazutoshi 4c16ddf588 Change avatar size on form hints (#6707)
7 years ago
Renato "Lond" Cerqueira 5ba4c36f95 Weblate translations (2018-03-09) (#6708)
7 years ago
Jenkins 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 5acd5315f2
Improve styling of closed registrations message, rename button (#6695)
7 years ago
Yamagishi Kazutoshi 1085ef3836 Weblate translations (2018-03-08) (#6690)
7 years ago
Effy Elden dd9d00d293 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 cb74c0cfe4 Add headings to the security settings page (#6661)
7 years ago
Renato "Lond" Cerqueira bd40574476 Weblate translations (05-03-2018) (#6640)
7 years ago
Marcin Mikołajczak 3b2e783c1f i18n: Update Polish translation (#6632)
7 years ago
Akihiko Odaki c110fa62ac Provide default OTP_SECRET value for development environment (#6617)
7 years ago
Akihiko Odaki 51d760960c Set the default locale in config (#6580)
7 years ago
Eugen Rochko 9110db41c5
Federate pinned statuses over ActivityPub (#6610)
7 years ago
Jeong Arm c82a2358bd Translate Korean (#6608)
7 years ago
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi ecf06d7e82 Change "or" translatable (#6597)
7 years ago
Alexander 42fe05dea1 fix logic for pam_controlled_service (#6599)
7 years ago
Yamagishi Kazutoshi 0963b6fd22 Weblate translations (2018-03-02) (#6588)
7 years ago
mayaeh e7d741ece3 i18n: Update Japanese translations (#6581)
7 years ago
Marcin Mikołajczak 51b7a22ea7 i18n: Update Polish translation (#6578)
7 years ago
Eugen Rochko 47bdb9b33b
Fix #942: Seamless LDAP login (#6556)
7 years ago
beatrix 4072b68686 remove Uglifier call from production.rb (#6568)
7 years ago
imncls 041df1a5a7
i18n normalize data
7 years ago
Ian McCowan c33931b613 Fix prev/next links on public profile page (#6497)
7 years ago
imncls e591b3fe38
Add missing Japanese translate
7 years ago
Akihiko Odaki 2e8a492e88 Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)
7 years ago
mayaeh 4d8c0d9959 i18n: Update Japanese translations (#6550)
7 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Ghislain Loaec e668180044 New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML strategies) (#6540)
7 years ago
Marcin Mikołajczak 3e46f12340 i18n: Update Polish translation (#6539)
7 years ago
Ghislain Loaec 3084fe4959 New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED + fixes #6533 (#6538)
7 years ago
Eugen Rochko c71aa468b5
Redesign landing page (again) (#6486)
7 years ago
Eugen Rochko 61ed133fea
Account archive download (#6460)
7 years ago
Eugen Rochko a7171af0a3
Fix avatar and header issues by using custom geometry detector (#6515)
7 years ago
Eugen Rochko 02856073f7
Fix #6509: Use pull queue for chewy jobs (#6513)
7 years ago