Merge tag 'v1.5.1' into imastodon #34
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
* fr.json: replace "silencer" with "masquer" "Silencer" as a verb does not exist in French. A good and valid replacement is "masquer". * FR translation: use "masquer" for "silence"
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
…don#4189) - Use unicode when selecting emoji through picker - Convert shortcodes to unicode when storing text input server-side - Do not convert shortcodes in JS anymore
* chore(yarn): Install babel-plugin-preval as development dependency * feat(babel): Add preval as a plugin * feat(emojione_light): Prevaled module what tree-shaked emojione * refactor(emoji): Use emojione_light * feat: Preload emojione_picker bundle * fix(emojione_light): Do not use Object.entries * fix(emojify): Update tests * chore(emojione_light): Remove silly ascii art
* Add Request class with HTTP signature generator Spec: https://tools.ietf.org/html/draft-cavage-http-signatures-06 * Add HTTP signature verification concern * Add test for SignatureVerification concern * Add basic test for Request class * Make PuSH subscribe/unsubscribe requests use new Request class Accidentally fix lease_seconds not being set and sent properly, and change the new minimum subscription duration to 1 day * Make all PuSH workers use new Request class * Make Salmon sender use new Request class * Make FetchLinkService use new Request class * Make FetchAtomService use the new Request class * Make Remotable use the new Request class * Make ResolveRemoteAccountService use the new Request class * Add more tests * Allow +-30 seconds window for signed request to remain valid * Disable time window validation for signed requests, restore 7 days as PuSH subscription duration (which was previous default due to a bug)
Both APIs process asynchronously, so reblogged/favourited fields in the response should be set to `false` manually.
* fix(components/media_modal): Center horizontally in Firefox * fix(components/status_list): Do not remove load more button
…ome (mastodon#4190) Resolves mastodon#4177 - smaller changeset
…ance domain (mastodon#4205) * Fix mastodon#2672 - Connect signed PuSH subscription requests to instance domain Resolves mastodon#2739 * Fix return of locate_subscription * Fix tests
* 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
* Add dependency on idn-ruby to speed up URI normalization * Use normalized_host instead of normalize.host when applicable When we are only interested in the normalized host, calling normalized_host avoids normalizing the other components of the URI as well as creating a new object
This fixes broken behavior and enable animation only on swiping.
- Objects must have attributedTo instead of actor - The current attribute belongs to CollectionPage, not Collection
* Shrink too wide single image modal Fix too wide react-swipeable-view-container Fix 0067f80 shrinking all react-swipeable-view-container Change to apply max-width of react-swipeable-view-container only under media-modal. Fix b30b03b just a typo * Centering contents in image-loader Centering small img, canvas, and video in image-loader.
…odon#4222) "defaults post privacy to followers-only" only means... * default value of `visibility` param on post API * default value for web UI privacy setting (i.e. it will be overridden if they once updated) ...so, many users won't see an effect of it.
* Check table existence on prepare_for_foreign_keys * Remove trailing whitespace
* i18n: update (pl) * Update pl.yml
- Follow, undo follow - Accept follow, reject follow - Like, undo like - Block, undo block - Delete (note) - Update (actor)
Though size of extended-video-player is already fixed to 80vw*80vh in components.scss, player size was also set to original video size in extended_video_player.js. Video size is fixed to 80vw*80vh, so video player's size must also be fixed to 80vw*80vh.
* i18n: Update Polish translation * Update Polish translation
System default libiconv of Alpine Linux only supports some charset (e.g. UTF-8). Therefore, the preview card of the page which is not UTF-8 will be broken in the Docker environment. Using GNU libiconv!
…don#4517) The feature to pin column could hide the rightmost column, which is specified with children property of ColumnsArea. The user is likely to see the column when the property changed, so scroll the area in such cases.
Salutation mailer + invalid reset link.
Neutral form used.
Translation for mastodon#4523
wrong character, sorry about that~
lnanase
force-pushed
the
merge_v1.5.1_imastodon
branch
from
ccb3588
to
bac8745
Compare
deflis
suggested changes
Aug 8, 2017
config/locales/ja-IM.yml
Outdated
| @@ -390,6 +432,76 @@ ja-IM: | |||
| click_to_show: クリックして表示 | |||
| reblogged: わかられました | |||
There was a problem hiding this comment.
ここの部分、jaだと さんにブーストされました になってるので さんにわかられました に変更したほうが良さそう
There was a problem hiding this comment.
ご指摘有難うございます。
確認したら、本verで変更されたようです。
修正致します。
* Fix conflict ** #4 Favicon and logo 'imas-atmark' change ** mastodon#8 add administrator announcement display * Locale files update
lnanase
force-pushed
the
merge_v1.5.1_imastodon
branch
from
bac8745
to
3c42c9d
Compare
|
皆様、お暑い中レビューして頂きありがとうございました。 |
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.
Fix conflict
Locale files update
5b0be74 のpendingを戻しました
今回のアップデートで登録ページやaboutページに大分修正が入りますので、
マージ&リリース後管理画面で色々修正する必要があります。
よろしくお願い致します。