79 Commits (3413105ec7b7c2d5afc94e1bb91f19714cf49887)

Author	SHA1	Message	Date
Thibaut Girka	c822ecfa01	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Akihiko Odaki	0cb1524dc1	Cache attachments on external host with service worker (#7493)	7 years ago
Thibaut Girka	af504e62ff	Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	7 years ago
Hugo Gameiro	27cfb13b83	Improve OpenStack v3 compatibility (#7392) ... * Update paperclip.rb * Update .env.production.sample * Update paperclip.rb	7 years ago
David Yip	c87f1d99e4	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml	7 years ago
MIYAGI Hikaru	28808f638e	HTTP proxy support for outgoing request, manage access to hidden service (#7134) ... * Add support for HTTP client proxy * Add access control for darknet Supress error when access to darknet via transparent proxy * Fix the codes pointed out * Lint * Fix an omission + lint * any? -> include? * Change detection method to regexp to avoid test fail	7 years ago
Jenkins	658440838b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	aec3ebab81	Document CORS requirement for asset host (#6941)	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
Jenkins	af2b57a054	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	8b18784116	Adjust suggested ES host in .env sample for docker-compose config (#6710)	7 years ago
Jenkins	54608d0486	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	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
David Yip	c08c971dd3	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml	7 years ago
Alexander	988f6505e4	fix logic for pam_controlled_service (#6599)	7 years ago
Eugen Rochko	35b45a5c11	Add LDAP options to .env.production.sample (#6592)	7 years ago
Eugen Rochko	f35356609b	Ensure the app does not even start if OTP_SECRET is not set (#6557) ... * Ensure the app does not even start if OTP_SECRET is not set * Remove PAPERCLIP_SECRET (it's not used by anything, actually) Imports are for internal consumption and the url option isn't even used correctly, so we can remove the hash stuff from them	7 years ago
Eugen Rochko	b5105e6898	Fix #6536 (#6558)	7 years ago
imncls	c0aabbec0f	Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb	7 years ago
Ghislain Loaec	d1806f5dc4	New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML strategies) (#6540)	7 years ago
Alexander	32cc2d8c9b	Update pam documentation (#6518) ... * document pam email extraction * remove superfluous newline	7 years ago
Ghislain Loaec	deea524052	New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED + fixes #6533 (#6538)	7 years ago
Jenkins	3a1f58e9eb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	7ca5a06505	Full-text search for authorized statuses (#6423) ... * Add full-text search for authorized statuses - Search API will return statuses that match the query - Only for logged in users - Only if you are author of the status, - Or you were mentioned in it - Or you favourited or reblogged it - Configuration over `ES_ENABLED`, `ES_HOST`, `ES_PORT`, `ES_PREFIX` - Run `rails chewy:deploy` to create & populate index Fix #5880 Fix #4293 Fix #1152 * Add commented out docker-compose configuration for ES container * Optimize index import, filter search results * Add basic normalization to the index * Add better stemming and normalization to the index * Skip webfinger request if search query includes both @ and a space * Fix code style * Visually separate search result sections * Fix code style issues	7 years ago
David Yip	4f8122a98c	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb	7 years ago
Eugen Rochko	555e7205da	Make PAM gem optional, allow configuration over environment (#6415)	7 years ago
Eugen Rochko	5322013f25	CAS + SAML authentication feature (#6425) ... * Cas authentication feature * Config * Remove class_eval + Omniauth initializer * Codeclimate review * Codeclimate review 2 * Codeclimate review 3 * Remove uid/email reconciliation * SAML authentication * Clean up code * Improve login form * Fix code style issues * Add locales	7 years ago
Jenkins	9ccad78647	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
nightpool	e921778dd3	enforce LOCAL_HTTPS=true in production (#6061) ... * enforce https in production * note changes in production env sample * typo fix	7 years ago
Lain Iwakura	a77e03ede4	Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.	7 years ago
Lain Iwakura	666540f4a8	Make character limit configurable.	7 years ago
Nolan Lawson	1e65921ed8	Document REDIS_NAMESPACE (#5038)	7 years ago
Patrick Figel	759bbdd9ca	Add OpenStack Keystone V3 support (#4889) ... Keystone V2 is deprecated in favour of V3. This adds the necessary connection parameters for establishing a V3 connection. Connections to V2 endpoints are still possible and the configuration should remain compatible. This also introduces a SWIFT_REGION variable for multi-region OpenStack environments and a SWIFT_CACHE_TTL that controls how long tokens and other meta-data is cached for. Caching tokens avoids rate-limiting errors that would result in media uploads becoming unavailable during high load or when using tasks like media:remove_remote. fog-openstack only supports token caching for V3 endpoints, so a recommendation for using V3 was added.	7 years ago
Yamagishi Kazutoshi	85909a8b22	Add environment sample for OpenStack Swift (#4816)	7 years ago
Treyssat-Vincent Nino	57e50aa023	comment correction (#4812)	7 years ago
ScienJus	ea264f848f	Show SMTP_TLS in config sample (#4477)	7 years ago
Yamagishi Kazutoshi	7be29a500d	Add Rake task for generate VAPID key (#4195) ... * Add Rake task for generate VAPID key * edit config/initializers/vapid.rb	7 years ago
Sorin Davidoi	ecab38fd66	Web Push Notifications (#3243) ... * feat: Register push subscription * feat: Notify when mentioned * feat: Boost, favourite, reply, follow, follow request * feat: Notification interaction * feat: Handle change of public key * feat: Unsubscribe if things go wrong * feat: Do not send normal notifications if push is enabled * feat: Focus client if open * refactor: Move push logic to WebPushSubscription * feat: Better title and body * feat: Localize messages * chore: Fix lint errors * feat: Settings * refactor: Lazy load * fix: Check if push settings exist * feat: Device-based preferences * refactor: Simplify logic * refactor: Pull request feedback * refactor: Pull request feedback * refactor: Create /api/web/push_subscriptions endpoint * feat: Spec PushSubscriptionController * refactor: WebPushSubscription => Web::PushSubscription * feat: Spec Web::PushSubscription * feat: Display first media attachment * feat: Support direction * fix: Stuff broken while rebasing * refactor: Integration with session activations * refactor: Cleanup * refactor: Simplify implementation * feat: Set VAPID keys via environment * chore: Comments * fix: Crash when no alerts * fix: Set VAPID keys in testing environment * fix: Follow link * feat: Notification actions * fix: Delete previous subscription * chore: Temporary logs * refactor: Move migration to a later date * fix: Fetch the correct session activation and misc bugs * refactor: Move migration to a later date * fix: Remove follow request (no notifications) * feat: Send administrator contact to push service * feat: Set time-to-live * fix: Do not show sensitive images * fix: Reducer crash in error handling * feat: Add badge * chore: Fix lint error * fix: Checkbox label overlap * fix: Check for payload support * fix: Rename action "type" (crash in latest Chrome) * feat: Action to expand notification * fix: Lint errors * fix: Unescape notification body * fix: Do not allow boosting if the status is hidden * feat: Add VAPID keys to the production sample environment * fix: Strip HTML tags from status * refactor: Better error messages * refactor: Handle browser not implementing the VAPID protocol (Samsung Internet) * fix: Error when target_status is nil * fix: Handle lack of image * fix: Delete reference to invalid subscriptions * feat: Better error handling * fix: Unescape HTML characters after tags are striped * refactor: Simpify code * fix: Modify to work with #4091 * Sort strings alphabetically * i18n: Updated Polish translation it annoys me that it's not fully localized :P * refactor: Use current_session in PushSubscriptionController * fix: Rebase mistake * fix: Set cacheName to mastodon * refactor: Pull request feedback * refactor: Remove logging statements * chore(yarn): Fix conflicts with master * chore(yarn): Copy latest from master * chore(yarn): Readd offline-plugin * refactor: Use save! and update! * refactor: Send notifications async * fix: Allow retry when push fails * fix: Save track for failed pushes * fix: Minify sw.js * fix: Remove account_id from fabricator	7 years ago
Chris	d388b5af3f	added 'https://' to CDN_HOST variable example (#3446)	8 years ago
Immae	ae917bfb23	Allow alternate domains for mastodon handlers (#3187)	8 years ago
Wonderfall	8b954737b8	Some Dockerfile improvements (#3182) ... - improve docker_entrypoint.sh - serve static files with puma by default - sort packages list - use virtual package for build deps - show how to assign UID/GID	8 years ago
Audun Larsen	2aa05dc765	Adds better documentation to LOCAL_DOMAIN and LOCAL_HTTPS (#3149) ... Fixes #2254	8 years ago
Jarek Lipski	4557bf1255	Improve example env file for local Postfix relay (#2892)	8 years ago
ThibG	02500e3f64	Add additional documentation and warnings to the WEB_DOMAIN setting. (#2386) ... * Add additional documentation and warnings to the WEB_DOMAIN setting. This feature is largely undocumented, and quite a number of users have shot them in the feet already despite the warning. Added a bit of documentation and expanded the warning until we have a mechanism for dealing with conflicting user URIs. * Change WEB_DOMAIN comments to point to the extensive online documentation	8 years ago
abcang	2ceaa88ed0	fix DB_URL (#2778)	8 years ago
Eugen Rochko	0951a2f9f3	Clean up redis configuration. Allow using REDIS_URL to set advanced (#2732) ... connection options instead of setting REDIS_HOST etc individually Close #1986	8 years ago
Akihiko Odaki	40a06ce911	Allow to set CA file for SMTP (#2713)	8 years ago
evilny0	520dd00efd	Updated note about 'none' SMTP authentication method in .env.production.sample (#2167)	8 years ago
Yamagishi Kazutoshi	a3358f438f	Change to switch signature version for Amazon S3 (#2124)	8 years ago