about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-09-09Merge branch 'origin/master' into sync/upstreamDavid Yip
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
2017-09-02Improve client-side German i18n (#4785)Eugen Rochko
2017-09-02Rename "locked" to "manuallyApprovesFollowers" in ActivityPub (#4779)Eugen Rochko
See: <https://www.w3.org/wiki/Activity_Streams_extensions#as:manuallyApprovesFollowers>
2017-09-02Validate data of Imports (#4782)abcang
2017-09-02i18n: Improve Polish translation (#4783)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-02Make "unfollow" undo pending outgoing follow request too (#4781)Eugen Rochko
* Make "unfollow" undo pending outgoing follow request too * Add cancel button to web UI when awaiting follow request approval * Make the hourglass button do the cancelling
2017-09-02fix text position of NSFW in Safari (Mac/iPhone) (#4570)PFM
2017-09-02Fix StatusLengthValidator testsaschmitz
This fixes the StatusLengthValidator tests to use StatusLengthValidator::MAX_CHARS to derive the length of the strings tested, and so makes them resilient to changes in MAX_CHARS (such as the one that made these tests fail, with it being changed from 500 to 512). This seems a bit odd for some types of tests, but appears to make sense here, where the testing goes beyond `status.length > MAX_CHARS`.
2017-09-02Raise an error for remote url in StatusFinder (#4776)unarist
* Raise an error for remote url in StatusFinder Previous implementation had allowed remote url with status id which also exists on local. Then that bug leads /api/web/embed to return wrong embed url. * Fix oembed_controller_spec
2017-09-02Fix WebPush (regression from #4524) (#4778)unarist
* Fix NoMethodError in Web::PushSubscription ``` undefined method `site_contact_email' for #<Class:0x00005976d13c40> /usr/local/bundle/gems/activerecord-5.1.3/lib/active_record/dynamic_matchers.rb:22:in `method_missing' /usr/local/bundle/gems/attr_encrypted-3.0.3/lib/attr_encrypted.rb:295:in `method_missing' /usr/local/bundle/gems/attr_encrypted-3.0.3/lib/attr_encrypted/adapters/active_record.rb:129:in `method_missing_with_attr_encrypted' /mastodon/app/models/web/push_subscription.rb:53:in `push_payload' ``` * Specify serializer in Web::NotificationSerializer
2017-09-02Don't unconditionally call `preventDefault` and `stopPropagation` on all ↵Surinna Curtis
keyup events (#4777) * UploadArea should only preventDefault for Escape This will make accessibility for some things less effortful, since we won't have to define a prior event handler to do whatever should be happening by default. * Remove workaround for fixed bug in SettingToggle SettingToggle was toggling itself in response to keydown of space, and then the keyup was doing it again
2017-09-02i18n: Update Polish translation (#4775)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-02Adjust settings pages (#4765)Lynx Kotoura
* views: Adjust heading positions * Adjust settings pages Adjust label. Adjust tables. Adjust admin/reports/* pages. Fix 2FA QR code style for narrow devices. Widen several pages. Increase contrast. * Remove trailing whitespace
2017-09-02Add Japanese translate for #4561 (#4771)Yamagishi Kazutoshi
2017-09-02Add text color style for noscript link (#4772)Yamagishi Kazutoshi
2017-09-02Fix profile page when use system's font (#4774)Yamagishi Kazutoshi
2017-09-02Disable embed modal when private status (#4773)Yamagishi Kazutoshi
* Disable embed modal when private status * Remove `reblogDisabled`
2017-09-02Define missing JSON-LD properties (#4767)Eugen Rochko
Using _: property names is discouraged, as in the future, canonicalization may throw an error when encountering that instead of discarding it silently like it does now. We are defining some ActivityStreams properties which we expect to land in ActivityStreams eventually, to ensure that future versions of Mastodon will remain compatible with this even once that happens. Those would be `locked`, `sensitive` and `Hashtag` We are defining a custom context inline for some properties which we do not expect to land in any other context. `atomUri`, `inReplyToAtomUri` and `conversation` are part of the custom defined OStatus context.
2017-09-02Use updated ActivityStreams context (added: sharedInbox) (#4764)Eugen Rochko
2017-09-02Add japanese translations for embed modal feature. (#4770)mayaeh
2017-09-02Add RoutingHelper (#4769)Yamagishi Kazutoshi
2017-09-02Add link to 'noscript' message (#4561)m4sk1n
* Add link to 'noscript' message Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * remove indent
2017-09-01Add ActivityPub handler for Delete->Actor activities (#4761)Eugen Rochko
2017-09-01Finish up embed modal feature (#4759)Eugen Rochko
* Add embed button to dropdowns of in-timeline statuses * yarn run manage:translations
2017-09-01Avoid sending some ActivityPub payloads if the receiver will get them ↵Eugen Rochko
through distribution (#4739)
2017-09-01Do not rely on activity arriving exactly once after delete arrived (#4754)Eugen Rochko
2017-09-01 Adjust padding on the public profile page (#4757)Cygnan
* Fix a style issue on the public profile page for some mobile browsers Signed-off-by: Cygnan <email@cygnan.com> * Set padding-bottom to 20px Signed-off-by: Cygnan <email@cygnan.com>
2017-09-01Deduplicate with local status on Create activity (#4763)unarist
2017-09-01Fix NoMethodError (#4762)Eugen Rochko
2017-09-01Make PreviewCard records reuseable between statuses (#4642)Eugen Rochko
* Make PreviewCard records reuseable between statuses **Warning!** Migration truncates preview_cards tablec * Allow a wider thumbnail for link preview, display it in horizontal layout (#4648) * Delete preview cards files before truncating * Rename old table instead of truncating it * Add mastodon:maintenance:remove_deprecated_preview_cards * Ignore deprecated_preview_cards in schema definition * Fix null behaviour
2017-09-01Use system's default font on non web UI pages (#4553)Yamagishi Kazutoshi
* Use system's default font on non web UI pages * Remove import for Redirect
2017-09-01Make first use less overwhelming with browser permissions (#4760)Eugen Rochko
- Ask for desktop notifications after 1 minute of use instead of instantly - Ask for protocol handler permission after 5 minutes of use instead of instantly
2017-09-01Update FR locales (#4714)Damien Erambert
* Make the fr locales up-to-date with the last changes (new profile view, applications) * Use the same wording for toots in fr.yml and fr.json * Translate the pin related strings * Translate pin-related locales on the front-end * Add missing locales in doorkeeper.fr.yml and remove un-used ones * Change "posts" back to "status" in the /about/more page in fr.yml * Fix typos for "status" in fr.yml * fix typo for "status" in fr.json * Remove duplicate string * Non-breaking space before punctuation * 'Better' translation for "unpin" * Put back 'pouet' where it was already * Fix * Fix
2017-09-01Refactor Web::PushSubscription, remove welcome message (#4524)Eugen Rochko
* Refactor Web::PushSubscription, remove welcome message * Add missing helper * Use locale of the receiver on push notifications (#4519) * Remove unused translations * Fix dir on notifications
2017-09-01Convert OStatus tag to ActivityPub id on in_reply_to resolution (#4756)unarist
2017-09-01Fallback from perform_via_activitypub on private posts (#4758)unarist
Currently, private / direct posts via OStatus from AP compatible instance will be dropped due to failing to fetch AP version. So this fallbacks to OStatus handling: * when failed to fetch ActivityPub version * when status is neither :public nor :unlisted
2017-08-31Remove workaround for fixed bug in SettingToggleSurinna Curtis
SettingToggle was toggling itself in response to keydown of space, and then the keyup was doing it again
2017-08-31UploadArea should only preventDefault for EscapeSurinna Curtis
This will make accessibility for some things less effortful, since we won't have to define a prior event handler to do whatever should be happening by default.
2017-08-31Remove identity context from output of LinkedDataSignature (#4753)Eugen Rochko
2017-08-31Don't process ActivityPub payload if signature is invalid (#4752)unarist
* Don't process ActivityPub payload if signature is invalid * Fix style issue
2017-08-31Guarantee Subscription service first account has proper URL details (#4732)James
* Guarantee Subscription service first account has proper URL details Subscription Service potentially could break if the first user suspended themselves, creating a situation where the urls that populate throughout subscription service's PuSH request would cause the remote API to throw 503 errors. Guaranteeing that the first account picked is not suspended prevents this problem. * Fix style issue
2017-08-31Fix the usages of Detect Passive Events (#4749)Akihiko Odaki
2017-08-31Embed modal (#4748)Eugen Rochko
* Embed modal * Proxy OEmbed requests from web UI
2017-08-31Add sharedInbox to actors (#4737)Eugen Rochko
2017-08-30Update to Alpine 3.6 (#4747)Wonderfall
2017-08-30error fixed (when loading pages in single column mode.) (#4746)MitarashiDango
2017-08-30Forward ActivityPub creates that reply to local statuses (#4709)Eugen Rochko
* Forward ActivityPub creates that reply to local statuses * Fix test * Fix wrong signers
2017-08-30Add close tag of iframe for oEmbed response (#4745)Yamagishi Kazutoshi
* Add close tag of iframe for oEmbed response * add comma
2017-08-30Use request.remote_ip instead of request.ip (#4744)nullkal
2017-08-30Update status embeds (#4742)Eugen Rochko
- 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
generated by cgit-pink (git 2.37.1) at 2024-11-06 12:53:56 +0000