69 Commits (cf754e6a911c7634b733db20bef4a3aed9508f5c)

Author SHA1 Message Date
Jenkins e553905ba7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 675b8fea53
Adjust suggested ES host in .env sample for docker-compose config (#6710)
7 years ago
Jenkins 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
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
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Alexander 42fe05dea1 fix logic for pam_controlled_service (#6599)
7 years ago
Eugen Rochko b4f8e87358
Add LDAP options to .env.production.sample (#6592)
7 years ago
Eugen Rochko 5cc716688a
Ensure the app does not even start if OTP_SECRET is not set (#6557)
7 years ago
Eugen Rochko f0a1b1a152
Fix #6536 (#6558)
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
Alexander 8fa924e372 Update pam documentation (#6518)
7 years ago
Ghislain Loaec 3084fe4959 New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED + fixes #6533 (#6538)
7 years ago
Jenkins efc9ffcb80 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 3ebc0ad4d3
Full-text search for authorized statuses (#6423)
7 years ago
David Yip a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 38e0133e1b
Make PAM gem optional, allow configuration over environment (#6415)
7 years ago
Eugen Rochko 26f21fd5a0
CAS + SAML authentication feature (#6425)
7 years ago
Jenkins 6d00ca1c71 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
nightpool 9592b5e31e enforce LOCAL_HTTPS=true in production (#6061)
7 years ago
Lain Iwakura ca5440b93d Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.
7 years ago
Lain Iwakura 6cd192b9fb Make character limit configurable.
7 years ago
Nolan Lawson d4f80824f7 Document REDIS_NAMESPACE (#5038)
7 years ago
Patrick Figel 3018043fc2 Add OpenStack Keystone V3 support (#4889)
7 years ago
Yamagishi Kazutoshi fa21d004c7 Add environment sample for OpenStack Swift (#4816)
7 years ago
Treyssat-Vincent Nino aefb4719bc comment correction (#4812)
7 years ago
ScienJus c3e355388a Show SMTP_TLS in config sample (#4477)
7 years ago
Yamagishi Kazutoshi 0fa9dd8527 Add Rake task for generate VAPID key (#4195)
7 years ago
Sorin Davidoi 0c7c188c45 Web Push Notifications (#3243)
7 years ago
Chris 23081bb299 added 'https://' to CDN_HOST variable example (#3446)
7 years ago
Immae a94c152fd3 Allow alternate domains for mastodon handlers (#3187)
7 years ago
Wonderfall ae78d012ac Some Dockerfile improvements (#3182)
7 years ago
Audun Larsen 3da521a586 Adds better documentation to LOCAL_DOMAIN and LOCAL_HTTPS (#3149)
7 years ago
Jarek Lipski b18504adfe Improve example env file for local Postfix relay (#2892)
7 years ago
ThibG 4d22d03fab Add additional documentation and warnings to the WEB_DOMAIN setting. (#2386)
7 years ago
abcang 629a4d0fca fix DB_URL (#2778)
7 years ago
Eugen Rochko c997091166 Clean up redis configuration. Allow using REDIS_URL to set advanced (#2732)
7 years ago
Akihiko Odaki 26bc591572 Allow to set CA file for SMTP (#2713)
7 years ago
evilny0 0876a06e45 Updated note about 'none' SMTP authentication method in .env.production.sample (#2167)
8 years ago
Yamagishi Kazutoshi 8b8e140c71 Change to switch signature version for Amazon S3 (#2124)
8 years ago
Ian Kelling fd62d4de10 Add documentation of SMTP_DOMAIN (#1738)
8 years ago
Miguel Jacq e9eaf9e33c Allow using an SMTP server without authentication (#1597)
8 years ago
geta6 64e1d51025 Improve streaming server with cluster (#1970)
8 years ago
Les Orchard 7609593e48 Add REDIS_DB env variable to configure Redis database (#1366)
8 years ago
ThibG a9529d3b4b Allow running mastodon on a different domain as the one used for identifying users (#1267)
8 years ago
Valentin Lorentz 5ab0ffc6c8 Custom Paperclip path. (#778)
8 years ago
James Moore d9dc0fe84e smtp delivery type fix (#1556)
8 years ago
Alexander Mankuta 0dbbc16c69 More SMTP customization (#1372)
8 years ago
Eugen d5a675099a Add env variable to disable prepared statements (#1293)
8 years ago
Eugen 3cb13bdd84 Merge pull request #1125 from jasonrhodes/patch-1
8 years ago