about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-07-18Merge changes from upstream with the CSS reload fixOndřej Hruška
2017-07-18Add Japanese translation for #4246 (#4249)lindwurm
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-07-18Update Japanese translations for new landing page (#4159)lindwurm
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-07-18Fix broken CSS reload due to webpack upgrade (#4250)Ondřej Hruška
2017-07-18Add Japanese translation for #4199 (#4247)unarist
2017-07-18Add unfollow modal (optional) (#4246)Yamagishi Kazutoshi
* Add unfollow modal * unfollowing someone * remove unnecessary prop
2017-07-18Introduce Ostatus name space (#4164)Akihiko Odaki
* Wrap methods of ProcessFeedService::ProcessEntry in classes This is a change same with 425acecfdb15093a265b191120fb2d4e4c4135c4, except that it has the following changes: * Revert irrelevant change in find_or_create_conversation * Fix error handling for RemoteActivity * Introduce Ostatus name space
2017-07-18Improve admin page (#4121)abcang
* Improve admin page * Fix test * Add spec * Improve select style
2017-07-18fix(push-subscriptions): Refactor how Sidekiq jobs are handled (#4226)Sorin Davidoi
2017-07-18Fixed issue that the NSFW image is not hidden on detail page (#4244)abcang
2017-07-18Add empty alt attribute to img elements in landing page (#4243)Yamagishi Kazutoshi
2017-07-18Download npm and yarn from Alpine packages repository (#4242)Yamagishi Kazutoshi
2017-07-18Exclude self toots from regular expression filter (#4245)Yamagishi Kazutoshi
* Exclude self toots from regular expression filter * refactor
2017-07-18Move icu-dev to build-dependencies (#4240)Yamagishi Kazutoshi
2017-07-18Install libidn11-dev in Vagrant (#4238)Yamagishi Kazutoshi
2017-07-18feat(push-notifications): Open link in current tab if possible (#4228)Sorin Davidoi
* fix(push-notification): Open link in current tab if possible * feat(sw): Skip waiting and claim clients
2017-07-18Require any modules after loading polyfill in entry points (#4231)Akihiko Odaki
app/javascript/mastodon/main.js delayed the execution of modules, but other entry points didn't. That leads to failure in executing modules, which requires those polyfills. Strictly enforce the rule to require any modules after loading polyfill in entry points.
2017-07-17Updated from tootsuiteOndřej Hruška
2017-07-17Quit overwriting style of extended-video-player (#4237)Lynx Kotoura
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.
2017-07-17Improve a query in WebPushNotificationWorker (#4234)Akihiko Odaki
2017-07-17Use update method to update session in WebPushNotificationWorker (#4235)Akihiko Odaki
2017-07-17fix(emojis): Handle multipoint emojis (e.g. country flags) (#4221)Sorin Davidoi
2017-07-17Add missing ActivityPub representations (#4230)Eugen Rochko
- Follow, undo follow - Accept follow, reject follow - Like, undo like - Block, undo block - Delete (note) - Update (actor)
2017-07-17i18n: update (pl) (#4233)m4sk1n
* i18n: update (pl) * Update pl.yml
2017-07-17Require images in common.js (#4232)Akihiko Odaki
2017-07-17Add public key declaration to actors (#4215)Eugen Rochko
2017-07-16Documentation and cleanupkibigo!
2017-07-16Fixes lack of <tbody> in header metadata tablekibigo!
2017-07-16Add SMTP_TLS variable for configuring TLS when server uses non-standard port ↵Eugen Rochko
(#4227)
2017-07-16Check table existence on prepare_for_foreign_keys (#4225)unarist
* Check table existence on prepare_for_foreign_keys * Remove trailing whitespace
2017-07-16Don't mention default post privacy on hints for locked accounts (#4222)unarist
"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.
2017-07-16Fix style settings for images in media modal (#4220)Lynx Kotoura
* 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.
2017-07-16Minor ActivityPub JSON fixes (#4214)Eugen Rochko
- Objects must have attributedTo instead of actor - The current attribute belongs to CollectionPage, not Collection
2017-07-16Install libidn with Docker (#4219)Yamagishi Kazutoshi
2017-07-16split added glitch locales from vanilla (#82)Ondřej Hruška
* Locale script now accepts overrides and new keys from glitch/locales * Revert glitchsoc changes to mastodon/locales to prevent future merge conflicts
2017-07-15FIXED STUFF FROM THE MERGE SORRY ;_;kibigo!
2017-07-15poke and visible docs urlkibigo!
2017-07-15Ported updates from #64kibigo!
2017-07-15Merge upstream (#81)kibigo!
2017-07-15Fix column swiping (#4211)unarist
This fixes broken behavior and enable animation only on swiping.
2017-07-15Optimize uri normalization (#4212)ThibG
* 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
2017-07-15Fixed issue #72 - bad css in report dialogOndřej Hruška
2017-07-15Raise search results count to 10 for testOndřej Hruška
reference: https://mastodon.xyz/users/lx/updates/278054
2017-07-15Fix broken letterboxing in media previewsOndřej Hruška
2017-07-15Move babel-plugin-preval to dependencies (#4209)Yamagishi Kazutoshi
2017-07-15Improve ActivityPub representations (#3844)Eugen Rochko
* 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
2017-07-15Fix #3773 - Pin favourites column (#4201)Eugen Rochko
2017-07-14Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)Eugen Rochko
* Fix #2672 - Connect signed PuSH subscription requests to instance domain Resolves #2739 * Fix return of locate_subscription * Fix tests
2017-07-14Fix subsequent replies to unresolved status not being filtered from home (#4190)Eugen Rochko
Resolves #4177 - smaller changeset
2017-07-14Small style fixes (#4206)Sorin Davidoi
* fix(components/media_modal): Center horizontally in Firefox * fix(components/status_list): Do not remove load more button