Merge Mastodon v.1.1.1 into the tootcafe branch #4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Corrected spelling error for "install"
Use nicer scrollbars in MS edge
…onfirmation to be enabled (mastodon#1278) * Fix mastodon#795, fix mastodon#704, fix mastodon#835 - 2FA requires confirmation to be enabled TOTP secret is not shown again after 2FA is enabled * Clean up
…astodon#1291) * Make /api/v1/timelines/public and /api/v1/timelines/tag/:id public Fix mastodon#1156 - respect query params when generating pagination links in API * Apply pagination fix to more APIs
* Adds task to confirm user by email. * Adds documentation for manual confirmation.
* Allows setting log level in env variable. * Made changes based on feedback in mastodon#1290.
A request to `/test` would show the custom 404 page, but a request to `/test.test` would return a 404 with an empty body. This change ignores the format on incoming catch all route requests, so that the html 404 page is returned on these requests.
* Clean up SQL output in Tag and Account search methods * Add basic coverage for Tag.search_for * Add coverage for Account.search_for * Add coverage for Account.advanced_search_for
* Add InstancePresenter to expose site details * Clean up about controller, use instance presenter
* French typo * Datetime french translation
* Update confirmation_instructions.fr.html.erb consistency across the French translation * Update consistency across the French translation * Update fr.yml a bunch of consistency across the French translation + a few typos * Update doorkeeper.fr.yml consistency across the French translation (punctuation)
* Update fr.jsx * Remove duplicate translation
* Remove unused helper files * Add coverage for application helper * Add coverage for StreamEntriesHelper #display_name
* Allow users to update their Account in the API It would be nice for API clients to be able to allow users to update their accounts without having to wrap Mastodon in a web view. This patch adds an API endpoint to let users submit a PATCH for their account. Signed-off-by: David Celis <me@davidcel.is> * Add /api/v1/accounts/update_credentials to the API docs Signed-off-by: David Celis <me@davidcel.is>
…a Web UI (mastodon#1289) * Put a useful message for new admins on /about/more I totally failed to realize this file was just defaults. I think this message would be a good default for people like me. * Revert default site description, expand comment This will keep setup-related stuff from leaking into public views, while still hopefully keeping over-eager admins from editing this file unnecessarily before RTFMing. (e.g., me)
* Use HTTP Accept-Language to detect locale * Fix gem order to comply with codeclimate * Sort gem to comply with rubocop * I18n.default_locale fallback when there is no accept-language header
…om URL (mastodon#1344) The goal of this change is to enhance Mastodon's handling of remote domains for which the APIs reside on a different host (see issue mastodon#1032). Indeed, when a remote user unknown to Mastodon is mentionned, only its profile URL (e.g. https://social.example.org/users/User) is known, and Mastodon has to build a @username@domain handle for it. To do so, Mastodon fetches the user's atom feed (e.g., https://social.example.org/users/User.atom) and uses its content to get the username part of the handle, and the URL's host part to build the domain (e.g., @user@social.example.org). This handle is then used for a Webfinger request. In the case where example.org serves the Webfinger info for @user@example.org and all feeds and APIs are hosted at social.example.org, Mastodon will still build @user@social.example.org and fail at resolving the account's details through Webfinger. This patch changes this behaviour by using the author's email address from the atom feed to build the handle. In Mastodon-generated atom feeds, the email address is always the handle it expects for federation.
added the missing fields and improved the translation
Sign-in redirects you back to last visited URL, but in case of API requests,
this sometimes redirected users to an API URL that, of course, greeted them
with an {"error":"The access token is invalid"}
|
Hm guess my only option is to squash due to conflicts, ah well. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.