mastodon

Commit Graph

Author	SHA1	Message	Date
Ondřej Hruška	daad07b1d5	Merge remote-tracking branch 'origin/better-themeing' into merging-upstream	8 years ago
Ondřej Hruška	83bda6c1a8	Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream	8 years ago
Ondřej Hruška	9330ea1f4d	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	8 years ago
Eugen Rochko	db3ed498b0	When OAuth password verification fails, return 401 instead of redirect (#5111 ) Call to warden.authenticate! in resource_owner_from_credentials would make the request redirect to sign-in path, which is a bad response for apps. Now bad credentials just return nil, which leads to HTTP 401 from Doorkeeper. Also, accounts with enabled 2FA cannot be logged into this way.	8 years ago
kibigo!	86e617a839	Better themeing support!!	8 years ago
Eugen Rochko	e528114c53	Follow-up to #4582 and #5027 , removing dead code (#5101 )	8 years ago
Eugen Rochko	b982d549f4	Add strong_migrations gem to warn when creating unsafe migrations (#5078 )	8 years ago
Eugen Rochko	d68df88d4e	Disable private status federation over OStatus (#5027 )	8 years ago
unarist	6db034a866	Re-allow underscore on valid_url_path_ending_chars (#4999 ) Limiting allowed characters in the last character of the URL is came from twitter-text, but underscore is allowed on there, and Mastodon before #4941.	8 years ago
ふぁぼ原	3816943e6b	Enable to recognize most kinds of characters as URL paths (#4941 )	8 years ago
abcang	1aad015bbb	Revert unique retry job (#4937 ) * Revert "Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836)" This reverts commit `6859d4c028`. * Revert "Do not execute the job with the same arguments as the retry job (#4814)" This reverts commit `be7ffa2d75`.	8 years ago
Patrick Figel	3018043fc2	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.	8 years ago
David Yip	67ad453373	Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss	8 years ago
David Yip	514fc908a3	Merge tag 'v1.6.0rc3' into sync/upstream	8 years ago
David Yip	b9f7bc149b	Merge branch 'origin/master' into sync/upstream Conflicts: app/javascript/mastodon/components/status_list.js app/javascript/mastodon/features/notifications/index.js app/javascript/mastodon/features/ui/components/modal_root.js app/javascript/mastodon/features/ui/components/onboarding_modal.js app/javascript/mastodon/features/ui/index.js app/javascript/styles/about.scss app/javascript/styles/accounts.scss app/javascript/styles/components.scss app/presenters/instance_presenter.rb app/services/post_status_service.rb app/services/reblog_service.rb app/views/about/more.html.haml app/views/about/show.html.haml app/views/accounts/_header.html.haml config/webpack/loaders/babel.js spec/controllers/api/v1/accounts/credentials_controller_spec.rb	8 years ago
abcang	6859d4c028	Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836 )	8 years ago
Adam Thurlow	6994664a13	swift-enable the paperclip! 📎 (#2322 )	8 years ago
abcang	be7ffa2d75	Do not execute the job with the same arguments as the retry job (#4814 )	8 years ago
Eugen Rochko	1b1e025b41	Use updated ActivityStreams context (added: sharedInbox) (#4764 )	8 years ago
Eugen Rochko	00840f4f2e	Add handling of Linked Data Signatures in payloads (#4687 ) * Add handling of Linked Data Signatures in payloads * Add a way to sign JSON, fix canonicalization of signature options * Fix signatureValue encoding, send out signed JSON when distributing * Add missing security context	9 years ago
Eugen Rochko	cf615abbf9	Add configuration to disable private status federation over PuSH (#4582 )	9 years ago
Colin Mitchell	871c0d251a	Application prefs section (#2758 ) * Add code for creating/managing apps to settings section * Add specs for app changes * Fix controller spec * Fix view file I pasted over by mistake * Add locale strings. Add 'my apps' to nav * Add Client ID/Secret to App page. Add some visual separation * Fix rubocop warnings * Fix embarrassing typo I lost an `end` statement while fixing a merge conflict. * Add code for creating/managing apps to settings section - Add specs for app changes - Add locale strings. Add 'my apps' to nav - Add Client ID/Secret to App page. Add some visual separation - Fix some bugs/warnings * Update to match code standards * Trigger notification * Add warning about not sharing API secrets * Tweak spec a bit * Cleanup fixture creation by using let! * Remove unused key * Add foreign key for application<->user	9 years ago
Eugen Rochko	6df8bd277b	Set correct content-type for ActivityPub JSON (#4592 )	9 years ago
Eugen Rochko	40be4ea239	Extend Devise remember_me longevity to 1 year instead of 2 weeks (#4587 ) Force SSL only cookies for remember_me, adjust confirmation expiration time to fit with the user cleanup scheduler	9 years ago
Eugen Rochko	dd7ef0dc41	Add ActivityPub inbox (#4216 ) * Add ActivityPub inbox * Handle ActivityPub deletes * Handle ActivityPub creates * Handle ActivityPub announces * Stubs for handling all activities that need to be handled * Add ActivityPub actor resolving * Handle conversation URI passing in ActivityPub * Handle content language in ActivityPub * Send accept header when fetching actor, handle JSON parse errors * Test for ActivityPub::FetchRemoteAccountService * Handle public key and icon/image when embedded/as array/as resolvable URI * Implement ActivityPub::FetchRemoteStatusService * Add stubs for more interactions * Undo activities implemented * Handle out of order activities * Hook up ActivityPub to ResolveRemoteAccountService, handle Update Account activities * Add fragment IDs to all transient activity serializers * Add tests and fixes * Add stubs for missing tests * Add more tests * Add more tests	9 years ago
unarist	b42c018bb8	Add Content-Type header on throttled response to fix mojibake (#4558 ) application/json only allows Unicode, so this prevents from wrong charset detection.	9 years ago
Ondřej Hruška	7a1ca8b0df	Merge remote-tracking branch 'upstream/master'	9 years ago
Eugen Rochko	df605f0f8b	Add "signed in as" header to some pages (#4523 )	9 years ago
Gô Shoemake	b61e3daf98	Multiple frontend support (#110 ) * Initial multiple frontend support * Removed unnecessary require() * Moved styles/images out of common	9 years ago
Eugen Rochko	8d6c3cd48a	Fix sessions being replaced needlessly (#4292 )	9 years ago
Eugen Rochko	a5a07da892	Correct OStatus inflection (Ostatus -> OStatus) (#4255 )	9 years ago
Eugen Rochko	8c45cd0e36	Improve ActivityPub representations (#3844 ) * Improve webfinger templates and make tests more flexible * Clean up AS2 representation of actor * Refactor outbox * Create activities representation * Add representations of followers/following collections, do not redirect /users/:username route if format is empty * Remove unused translations * ActivityPub endpoint for single statuses, add ActivityPub::TagManager for better URL/URI generation * Add ActivityPub::TagManager#to * Represent all attachments as Document instead of Image/Video specifically (Because for remote ones we may not know for sure) Add mentions and hashtags representation to AP notes * Add AP-resolvable hashtag URIs * Use ActiveModelSerializers for ActivityPub * Clean up unused translations * Separate route for object and activity * Adjust cc/to matrices * Add to/cc to activities, ensure announce activity embeds target status and not the wrapper status, add "id" to all collections	9 years ago
Yamagishi Kazutoshi	0fa9dd8527	Add Rake task for generate VAPID key (#4195 ) * Add Rake task for generate VAPID key * edit config/initializers/vapid.rb	9 years ago
Sorin Davidoi	0c7c188c45	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	9 years ago
Eugen Rochko	056b5ed72f	Improve UI of admin site settings (#4163 )	9 years ago
Eugen Rochko	00df69bc89	Fix #4058 - Use a long-lived cookie to keep track of user-level sessions (#4091 ) * Fix #4058 - Use a long-lived cookie to keep track of user-level sessions * Fix tests, smooth migrate from previous session-based identifier	9 years ago
Yamagishi Kazutoshi	76eda2fc21	Add recursive object support to API response (#4095 )	9 years ago
Eugen Rochko	f7301bd5b9	Add overview of active sessions (#3929 ) * Add overview of active sessions * Better display of browser/platform name * Improve how browser information is stored and displayed for sessions overview * Fix test	9 years ago
Sorin Davidoi	2211e8d1cd	Revocable sessions (#3616 ) * feat: Revocable sessions * fix: Tests using sign_in * feat: Configuration entry for the maximum number of session activations	9 years ago
Eugen Rochko	f3be605286	Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847 ) Rename Activitypub to ActivityPub	9 years ago
Matt Jankowski	2212dc4aaa	Update Rails to version 5.1.1 (#3121 ) * Update rails to version 5.1.1 * Run `rails app:update` * Remove the override of polymorphic activity relationship * Silence warning about otp_secret attribute being unknown to rails * We will only introduce form_with where we want to use remote data	9 years ago
Immae	a94c152fd3	Allow alternate domains for mastodon handlers (#3187 )	9 years ago
Clworld	df92f010ad	Set config.cache_store in environments file. (#3219 ) * Set config.cache_store in application.rb * Set config.cache_store in environments. * fix code format.	9 years ago
Eugen Rochko	20c0054460	Adjust REDIS_URL usage in node_redis (#3183 ) Resolves #2780	9 years ago
Eugen Rochko	d78f555254	Improve language filter preferences look (#3184 )	9 years ago
beatrix	5c1f70b5c5	namespace redis usage (#2869 ) * add redis-namespace gem * namespace redis usage * refactor redis namespace code to be less intrusive previously : would be prepended to keys when the REDIS_NAMESPACE env var was not set now if it is not set the namespacing functions are not used at all, which should prevent disruptions when instances update. * fix redis namespace variable style in streaming js * remove trailing space * final redis namespace style fix	9 years ago
alpaca-tc	ee3e0a93f4	Fixes unknown mime type (#2822 )	9 years ago
Akihiko Odaki	0cdcf32865	Use ws protocol in streaming API base URL (#2606 )	9 years ago
alpaca-tc	db92eec876	Localize 'throttled' (#2755 )	9 years ago
Eugen Rochko	c997091166	Clean up redis configuration. Allow using REDIS_URL to set advanced (#2732 ) connection options instead of setting REDIS_HOST etc individually Close #1986	9 years ago

1 2 3 4

173 Commits (85d5da86dfd3589e345a68c19fff7d7bc2524532)