Merge tag 'v1.4.1' into imastodon #10
Merged
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
…Atom (mastodon#2988) Receiving instances will then use their own missing image Also, add <content /> to deleted statuses, since there was a reported problem with the deletes and GNU social
…preceding @ (mastodon#2991) * Fix mastodon#2027 - Accept own ID for remote follow with and without preceding @ Fix mastodon#2177 - Omit leading "acct:" in remote follow redirect template expansion * Fix test
…lists (mastodon#2993) Fix mastodon#2221 - Catch OpenSSL exceptions when loading remote avatars/headers/attachments Don't strip "rel" attribute from <a> tags when sanitizing (microformats)
There are some dependencies that are no longer needed anymore. As a result, it took more time to install the package than necessary. I want to delete them and shorten the installation time.
* Update doorkeeper.ar.yml - Remodelling doorkeeper.ar.yml and adding missing strings from english version to arabic version. - Translating max strings - Reviewing some translations - Other strings to be translated later (complicated somehow) * Update doorkeeper.ar.yml Updating translations from lines : 88 to 91
Updating some arabic translations.
* Add yarn-error.log to gitignore * Add yarn-debug.log to gitignore
Use https://github.com/heroku/heroku-buildpack-apt to install protobuf-compiler and libprotobuf-dev which are needed by cid3
Remove unnecessary messages added in mastodon#1879. It is duplicated with other keys, causing the correct message not to be displayed.
Use ES Class Fields & Static Properties (currently stage 2) for improve class outlook. Added babel-plugin-transform-class-properties as a Babel plugin.
* Normalize locales * Restore "mention" locale key
Sidekiq doesn't need a port, however that env var is used for generating URLs in development, so when foreman sets it wrong, you get bad URLs from the streaming API during development
The current text contrast on the privacy warning is a WCAG violation. I didn't notice this because my instance has a custom theme which is better. On default theme I am barely able to read the text with my impaired vision. This patch brings the contrast to Normal Text WCAG AA compliance, and Large Text WCAG AAA compliance.
…n#3013) so that when a reblog parse fails on another instance, it doesn't look like a misattributed/stolen text
* Add <ostatus:conversation /> tag to Atom input/output Only uses ref attribute (not href) because href would be the alternate link that's always included also. Creates new conversation for every non-reply status. Carries over conversation for every reply. Keeps remote URIs verbatim, generates local URIs on the fly like the rest of them. * Fix conversation migration * More spec coverage for status before_create * Prevent n+1 query when generating Atom with the new conversations * Improve code style * Remove redundant local variable
* Allow SCSS variables to be overridden with `app/javascript/pack/variables*.scss` * Allow these SCSS variables to be overriden: * `$base-shadow-color` * `$base-overlay-background` * `$base-border-color` * `$simple-background-color` * `$primary-text-color` * `$valid-value-color * `$error-value-color`
* Fix color contrast some more in privacy warning Latest master appears to have changed the <strong> to this unreadable grey color. If you want that to be white then it should be pure white. If someone would rather revert this to that strong dark blue color it was before that would be good too. * Make domain dark blue again * add missing ; woops
* Framework for delivery worker spec * Refactor of pubsub delivery worker
Got an error in asset precompile on Heroku: Module build failed: Error: ENOENT: no such file or directory, scandir '/tmp/.../node_modules/node-sass/vendor' ref: https://github.com/rails/webpacker#troubleshooting
for this file.
* selectively Revert "Fix regressions from mastodon#2683 (mastodon#2970)" This reverts commit 72698bc. * Revert "Handle hashtags in spoiler_texts (partial fix for mastodon#699) (mastodon#2683)" This reverts commit e249168.
* Fix nil input not handled well in AuthorExtractor concern * Fix hard error in ProcessFeedService when replied-to status has been deleted * Fix nil errors in ProcessInteractionService when favourited status cannot be found
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* Update simple_form.oc.yml * Added check spam folder * Update oc.json abonats => seguidors * Update oc.yml * Update oc.json Added translations + corrections * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb * i18n mailer * Update reset_password_instructions.oc.html.erb
* Update nl strings for 1.4 * Update nl strings for 1.4 * Update nl strings for 1.4 * nl strings (+1) More new OTP strings will be translated another time
… present (mastodon#3332) * Fix mastodon#2922 - Load stylesheet from "custom.css" entrypoint when present This is pretty much the same way it worked as before, albeit with having to create app/javascript/packs/custom.js with require('../styles/custom.scss') (or whatever you want really), which will be a blank slate for you to import whatever you want * Remove old assets directory * Extract font-awesome into common.css and always load it
* Improve streaming API cluster logging * Less verbose error middleware logging (stack trace useless there) * Fix error logging * Prevent potential issue * Add missing "done()" in catch of Promise.all, websocket heartbeat re-implemented like in example * I actually forgot a done(), the absolute madman
* Persian translation fix * Persian translation of new strings
* Enhance for the Chinese translation * Add filtered_languages for Chinese Translation include CN/HK/TW for PR mastodon#3175 * i18n: Add some tags for Chinese translation * i18n: Add some tags for Chinese translation
Webpacker failed to parse output of Webpack when a module requires non-existent module or has similar errors. This commit fixes the bug.
…2608 (mastodon#3392) The combination of object-fit, relative position 50% from top and translating it back upwards 50% is what allows us to crop the video properly, so it needs to be +50%-50%
* fix conflicts * imastodon original jsx files update to js file * imastodon localize file fix and update
takayamaki
approved these changes
Jun 7, 2017
fvh-P
approved these changes
Jun 8, 2017
|
@fvh-P |
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.
v1.4.1のマージ及びv1.4.1に合わせた修正
#9
fix conflicts
imastodon original jsx files update to js file
imastodon localize file fix and update