about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-07-20Merge pull request #87 from tootsuite/masterbeatrix
merge upstream
2017-07-19Restructured local settings internalskibigo!
2017-07-20Fix webfinger retries (#4275)Eugen Rochko
* Do not raise unretryable exceptions in ResolveRemoteAccountService * Removed fatal exceptions from ResolveRemoteAccountService Exceptions that cannot be retried should not be raised. New exception class for those that can be retried (Mastodon::UnexpectedResponseError)
2017-07-20feat(css): Remove border radius from WebKit's scrollbars (#4278)Sorin Davidoi
2017-07-19fix(status_list): Update scroll position after toots are appended (#4277)Sorin Davidoi
2017-07-19fix(push_subscription): Guard against malformed favourite notification (#4271)Sorin Davidoi
2017-07-19Update scroll top state on column mounting (#4276)unarist
2017-07-19fix: Handle errors without response (#4274)Sorin Davidoi
2017-07-19Add ActivityPub attributes to accounts (#4273)Eugen Rochko
2017-07-19Fix logging in ProcessFeedService (#4270)Akihiko Odaki
2017-07-19Refactor ResolveRemoteAccountService (#4258)Eugen Rochko
* Refactor ResolveRemoteAccountService * Remove trailing whitespace * Use redis locks around critical ResolveRemoteAccountService code * Add test for race condition of lock
2017-07-19Fix a typo in public.js (double semicolons) (#4269)Cygnan
Signed-off-by: Cygnan <mail@cygnan.com>
2017-07-19i18n: Update Polish translation (#4268)m4sk1n
2017-07-19Fix deprecation warning for non-pipeline assets (#4267)Eugen Rochko
2017-07-19i18n: @716f4cb (pl) (#4266)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-19fix missing closing <p> tag in ToS in en.yml (#4262)Damien Erambert
2017-07-19Fix missing closing <p> tag in ToS in .yml files (#4264)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-19Add feature to revoke sessions (#4259)Yamagishi Kazutoshi
2017-07-19Correct OStatus inflection (Ostatus -> OStatus) (#4255)Eugen Rochko
2017-07-18feat(emoji): Add back title attribute (#4253)Sorin Davidoi
2017-07-18Fix for stylesheet splitkibigo!
2017-07-18Add sourceRoot/includePaths to loadersSurinna Curtis
Use the settings modal as an example/testcase
2017-07-18Update Japanese translation (chase #4249) (#4251)lindwurm
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-07-18i18n: Update Polish translation (#4252)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-18Merge branch 'tootsuite-master'Ondřej Hruška
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
generated by cgit-pink (git 2.37.1) at 2024-12-26 20:52:27 +0000