mastodon

Commit Graph

Author	SHA1	Message	Date
David Yip	870d71b78b	Merge branch 'master' into gs-master	8 years ago
nullkal	781105293c	Feature: Unlisted custom emojis (#5485 )	8 years ago
beatrix	a2612d0d38	Merge pull request #179 from glitch-soc/keyword-mute Keyword muting	8 years ago
David Yip	42f2045c21	Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline	8 years ago
Matthew Walsh	3db80f75a6	Added a timeline for Direct statuses * Lists all Direct statuses you've sent and received * Displayed in Getting Started * Streaming server support for direct TL	8 years ago
David Yip	cd04e3df58	Fill in create, edit, update, and destroy for keyword mutes interface. Also add a destroy-all action, which can be useful if you're flushing an old list entirely to start a new one.	8 years ago
David Yip	4fa2f7e82d	Set up /settings/keyword_mutes. #164 . This should eventually be accessible via the API and the web frontend, but I find it easier to set up an editing interface using Rails templates and the like. We can always take it out if it turns out we don't need it.	8 years ago
kibigo!	8d6b9ba494	Merge upstream 2.0ish #165	8 years ago
nullkal	633426b261	Add moderation note (#5240 ) * Add moderation note * Add frozen_string_literal * Make rspec pass	8 years ago
Eugen Rochko	3a3475450e	Encode custom emojis as resolveable objects in ActivityPub (#5243 ) * Encode custom emojis as resolveable objects in ActivityPub * Improve code style	8 years ago
Eugen Rochko	49cc0eb3e7	Improve admin UI for custom emojis, add copy/disable/enable (#5231 )	8 years ago
utam0k	b3af3f9f8c	Implement EmailBlackList (#5109 ) * Implement BlacklistedEmailDomain * Use Faker::Internet.domain_name * Remove note column * Add frozen_string_literal comment * Delete unnecessary codes * Sort alphabetically * Change of wording * Rename BlacklistedEmailDomain to EmailDomainBlock	8 years ago
Yamagishi Kazutoshi	178f718a9b	Separate notifications preferences from general preferences (#4447 ) * Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications	8 years ago
Eugen Rochko	eb605141ff	Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112 )	8 years ago
Eugen Rochko	4ec1771165	Add ability to specify alternative text for media attachments (#5123 ) * Fix #117 - Add ability to specify alternative text for media attachments - POST /api/v1/media accepts `description` straight away - PUT /api/v1/media/:id to update `description` (only for unattached ones) - Serialized as `name` of Document object in ActivityPub - Uploads form adjusted for better performance and description input * Add tests * Change undo button blend mode to difference	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	293972f716	New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051 )	8 years ago
Eugen Rochko	09a94b575e	Admin interface for listing, adding and removing custom emojis (#5002 ) * Admin interface for listing, adding and removing custom emojis * Only display local ones in the list	8 years ago
Eugen Rochko	54edb4b853	When accessing uncached media attachment, redownload it (#4955 ) * When accessing uncached media attachment, redownload it * Prevent re-download of rejected media	8 years ago
Surinna Curtis	70592cdaba	Add a /api/v1/mutes/details route that just returns the array of mutes.	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
Eugen Rochko	d1a78eba15	Embed modal (#4748 ) * Embed modal * Proxy OEmbed requests from web UI	8 years ago
Eugen Rochko	2db9ccaf3e	Add sharedInbox to actors (#4737 )	8 years ago
Eugen Rochko	e95bdec7c5	Update status embeds (#4742 ) - Use statuses controller for embeds instead of stream entries controller - Prefer /@:username/:id/embed URL for embeds - Use /@:username as author_url in OEmbed - Add follow link to embeds which opens web intent in new window - Use redis cache in development - Cache entire embed	8 years ago
Eugen Rochko	9caa90025f	Pinned statuses (#4675 ) * Pinned statuses * yarn manage:translations	8 years ago
Eugen Rochko	c1b086a538	Fix up the applications area (#4664 ) - Section it into "Development" area - Improve UI of application form, index, and details	8 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	8 years ago
Eugen Rochko	ca7ea1aba9	Redesign public profiles (#4608 ) * Redesign public profiles * Responsive design * Change public profile status filtering defaults and add options - No longer displays private/direct toots even if you are permitted access - By default omits replies - "With replies" option - "Media only" option * Redesign account grid cards * Fix style issues	8 years ago
Eugen Rochko	3c6503038e	Add protocol handler. Handle follow intents (#4511 ) * Add protocol handler. Handle follow intents * Add share intent * Improve code in intents controller * Adjust share form CSS	8 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	8 years ago
kibigo!	8150689b48	Merge upstream (#111 )	8 years ago
Eugen Rochko	6270f9ce34	Fix #3189 - Share CSRF secret between main app and Sidekiq Web (#4383 )	8 years ago
Ondřej Hruška	7e5691804d	Merge git://github.com/tootsuite/mastodon into tootsuite-master	8 years ago
Yamagishi Kazutoshi	ef16089c6d	Redirect user profile page to short URL when HTML format (#4328 )	8 years ago
beatrix-bitrot	984d2d4cb6	Merge that good fresh upstream shit	8 years ago
Ondřej Hruška	604654ccb4	New notification cleaning mode (#89 ) This PR adds a new notification cleaning mode, super perfectly tuned for accessibility, and removes the previous notification cleaning functionality as it's now redundant. * w.i.p. notif clearing mode * Better CSS for selected notification and shorter text if Stretch is off * wip for rebase ~ * all working in notif clearing mode, except the actual removal * bulk delete route for piggo * cleaning + refactor. endpoint gives 422 for some reason * formatting * use the right route * fix broken destroy_multiple * load more notifs after succ cleaning * satisfy eslint * Removed CSS for the old notif delete button * Tabindex=0 is mandatory In order to make it possible to tab to this element you must have tab index = 0. Removing this violates WCAG and makes it impossible to use the interface without good eyesight and a mouse. So nobody with certain mobility impairments, vision impairments, or brain injuries would be able to use this feature if you don't have tabindex=0 * Corrected aria-label Previous label implied a different behavior from what actually happens * aria role localization & made the overlay behave like a checkbox * checkboxes css and better contrast * color tuning for the notif overlay * fanceh checkboxes etc and nice backgrounds * SHUT UP TRAVIS	8 years ago
Eugen Rochko	4b911fea03	Add button to re-subscribe to all accounts from a domain (#4285 )	8 years ago
beatrix	e7edb4d1ee	Merge pull request #87 from tootsuite/master merge upstream	8 years ago
Yamagishi Kazutoshi	716f4cb11c	Add feature to revoke sessions (#4259 )	8 years ago
Ondřej Hruška	d69fa9e1f4	Merge changes from upstream with the CSS reload fix	8 years ago
abcang	4d42a38954	Improve admin page (#4121 ) * Improve admin page * Fix test * Add spec * Improve select style	8 years ago
kibigo!	09cfc079b0	Merge upstream (#81 )	8 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	8 years ago
Ondřej Hruška	75aafc932e	Added buttons and menu items to dismiss individual notifications (#76 ) * Added DELETE verb for notifications * Added notification dismiss button to status dropdown * Added reveal-on-hover notif dismiss button, added FollowNotification component	8 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	8 years ago
Eugen Rochko	4a618908e8	Account deletion (#3728 ) * Add form for account deletion * If avatar or header are gone from source, remove them * Add option to have SuspendAccountService remove user record, add tests * Exclude suspended accounts from search	8 years ago
Matt Jankowski	2925372ff4	Move create/destroy actions for api/v1/statuses to namespace (#3678 ) Each of mute, favourite, reblog has been updated to: - Have a separate controller with just a create and destroy action - Preserve historical route names to not break the API - Mild refactoring to break up long methods	8 years ago
Matt Jankowski	5282ba862a	Move reblogged_by and favourited_by actions out of api/v1/statuses and into unique controllers (#3646 ) * Add specs for api statuses routes * Update favourited_by and reblogged_by api routes * Move methods into new controllers * Use load_accounts methods to simplify index actions * Clean up load_accounts methods * Clean up link header generation * Check for link headers in specs * Remove unused actions from api/v1/statuses controller * Remove specs for moved actions	8 years ago
Eugen Rochko	8902e265b4	Add explit admin actions to (re)subscribe/unsubscribe remote accounts (#3640 ) * Add explit admin actions to (re)subscribe/unsubscribe remote accounts and re-download avatar/header * Improve how admin NSFW toggle looks	8 years ago

1 2 3 4

183 Commits (870d71b78be74b7fab4892a79a87aff39b1e2726)