about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-06-06Add missing key attribute to .search-results__hashtag (#3607)Yamagishi Kazutoshi
2017-06-06Update hr.json (#3609)May Kittens Devour Your Soul
2017-06-06Fix typo (storyboard -> storybook) (#3603)Yamagishi Kazutoshi
2017-06-06i18n: updated Polish translation (#3597)m4sk1n
* i18n: updated Polish translation * i18n: updated Polish translation btw it would be nice to have master-based Mastodon instance (even isolated from others) to test translation.
2017-06-06Add quotes ESLint rules (#3602)Yamagishi Kazutoshi
* Add quotes ESLint rule * Add jsx-quotes ESlint rule * Sort ESLint rules
2017-06-06Disable ESLint rule jsx/anchor-has-content (#3601)Yamagishi Kazutoshi
2017-06-06Try fixing ThreadResolveWorker calls (#3599)ThibG
* Try fixing ThreadResolveWorker calls From my understanding of ActiveRecord, a transaction is commited as soon as the exit of the outmost ActiveRecord.transaction block. However, inner transaction blocks will exit without the transaction being commited. In this case, ThreadResolveWorker were fired *within* a transaction block, so moving the call out of it should do the trick. However, this is somewhat fragile, as this whole codepath could be called within yet another transaction. * Set status thread within the transaction block if it is immediately available from database
2017-06-05Fix LoadMore in Notifications. (#3590)Naoki Kosaka
2017-06-05Fix (PR #3585) Add hasMore to propTypes and cover handleScroll. (#3589)Naoki Kosaka
2017-06-05Add back button to hashtag timeline again (#3587)unarist
2017-06-05Add th.json. (#3588)Shunsuke Michii
2017-06-05Add streaming_api_base_url to /api/v1/instance (#3556)IkUrA
* Add streaming_api_base_url to /api/v1/instance * Adjust spaces * nested view * re-adjust spaces
2017-06-05Introduce StatusThreadingConcern (#3490)Matt Jankowski
* Add a StatusFilter class to identify visibility of statuses by accounts * Extract StatusThreadingConcern from Status * Clarify purpose of checking for nil account
2017-06-05Prevent pinned columns from scroll to top on URL changing (#3586)unarist
2017-06-05Fix LoadMore in following and followers. (#3585)Naoki Kosaka
2017-06-05Fix #3550 - Add all missing foreign keys (#3562)Eugen Rochko
* Fix #3550 - Add all missing foreign keys * Add missing foreign keys
2017-06-05Redirect to streaming_api_base_url (#3579)Daigo 3 Dango
* Redirect to streaming_api_base_url When Rails receives a request to streaming API, it most likely means that there is another host which is configured to respond to it. This is to redirect clients to that host if `STREAMING_API_BASE_URL` is set as another host. * Use the new Ruby 1.9 hash syntax
2017-06-05Add support key shortcut to Onboarding Modal (#3517)Yamagishi Kazutoshi
* Add support key shortcut to Onboarding Modal * this.state.pages -> this.pages
2017-06-05Fix broken embed page (#3577)Yamagishi Kazutoshi
2017-06-05Add OnboadingModal story (#3578)Yamagishi Kazutoshi
2017-06-05Fix randomly fail (regression from #3560) (#3580)Yamagishi Kazutoshi
2017-06-05Skip image length check (regression from #3528) (#3581)Yamagishi Kazutoshi
2017-06-05Don't follow account if it's already followed (#3575)René Klačan
Closes https://github.com/tootsuite/mastodon/issues/3102
2017-06-05Add migration versions (#3574)René Klačan
Since Rails 5.1 missing migration version results in following error: ``` StandardError: Directly inheriting from ActiveRecord::Migration is not supported. Please specify the Rails release the migration was written for: ``` This PR fixes all migration files.
2017-06-05l10n update for occitan language (#3557)Quent-in
* i18n Update : Add preference setting for delete toot modal Adding a line for "Add preference setting for delete toot modal" * i18n update for pin/unpin Update to add two more translations * i18n update to have the dates in plain occitan * Removed the blank line * %{selft} back in the translation
2017-06-05Gem version bumps (#3524)Matt Jankowski
* Update annotate to version 2.7.2 * Update puma to version 3.9.0 * Update aws-sdk to version 2.9.28 * Update bootsnap to version 1.0.0 * Update nio4r to version 2.1.0 * Update nokogumbo to version 1.4.12 * Update oj to version 3.0.11 * Update pkg-config to version 1.2.3 * Update rubocop to version 0.49.1 * Update sidekiq-scheduler to version 2.1.5
2017-06-05Added support for configurable reserved usernames (fix of #1382) (#3566)Eugen Rochko
* Added support for configurable reserved usernames * Added reserved usernames from mastodon issue 1355 * Fix reserved usernames
2017-06-05Add date to ignore_missing and ignore_unused in config/i18n-tasks.yml (#3572)Yamagishi Kazutoshi
2017-06-04Cover WebfingerResource more (#3560)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-04Update dependencies of Node.js (#3561)Yamagishi Kazutoshi
* Update axios to version 0.16.2 * Update css-loader to version 0.28.4 * Update postcss-smart-import to version 0.7.4 * Update react-immutable-pure-component to version 0.0.5 * Update stringz to version 0.2.1 * Update style-loader to version 0.18.1 * Update websocket.js to version 0.1.9 * yarn upgrade
2017-06-04Spec ScopedSettings (#3559)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-04Upgrade storybook to v3 (#3558)Yamagishi Kazutoshi
2017-06-04Remove some code in TagManager and spec (#3547)Akihiko Odaki (@fn_aki@pawoo.net)
* Do not fall back to StreamEntry if object_type is unavailable in TagManager Since 6d6a429af8fe4bd92ed497f401676353fdc603e0, when Status, the only model with stream_entry, and StreamEntry got its own logic in uri_for and url_for, the purpose of the fallbacks to activity_type of StreamEntry became unclear. This commit removes the fallbacks. When adding another model with stream_entry in future, consider to update uri_for and url_for. * Cover TagManager more
2017-06-04i18n: Updated Polish translation (#3555)m4sk1n
2017-06-04l10n: ja: Change about/more link text (#3539)lindwurm
ref: #3538 ("Extended information" -> "About this instance") and #3519 Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-06-04Spec InlineRablScope (#3542)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-04Spec HashObject (#3544)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-04A minor change for ProviderDiscovery and spec (#3543)Akihiko Odaki (@fn_aki@pawoo.net)
* Do not default the format in ProviderDiscovery The format should be determined when discovering, as it is in the current implementation, and it is a flaw if it is not determined. * Spec ProviderDiscovery
2017-06-04Remove some arguments of Formatter.instance.format and spec (#3541)Akihiko Odaki (@fn_aki@pawoo.net)
* Remove some arguments of Formatter.instance.format * Improve spec for Formatter
2017-06-04Spec Extractor (#3540)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-04Spec action verification of StreamEntryFinder (#3549)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-04Remove Targetable (#3548)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-04Fix limit_param in favourites_controller.rb (#3553)Naoki Kosaka
2017-06-04Fix column buttons overflow in Japanese (#3552)Yamagishi Kazutoshi
2017-06-04Add Japanese translations (pin) (#3551)Yamagishi Kazutoshi
* Add Japanese translations (pin) * "ピン留め" is more general
2017-06-04Fix all icons in the column header being hilighted (#3554)unarist
2017-06-04en.json: change about/more link text to "About this instance" (#3538)Mingye Wang
This change follows #3519, which does the same for the Chinese variants. Or should it be simply "About"?
2017-06-04Allow mounting arbitrary columns (#3207)Eugen Rochko
* Allow mounting arbitrary columns * Refactor column headers, allow pinning/unpinning and moving columns around * Collapse animation * Re-introduce scroll to top * Save column settings properly, do not display pin options in single-column view, do not display collapse icon if there is nothing to collapse * Fix one instance of public timeline being closed closing the stream Fix back buttons inconsistently sending you back to / even if history exists * Getting started displays links to columns that are not mounted
2017-06-04refocus-after-toot (#3537)masarakki
2017-06-04change sidekiq queueing to bulk push (#3536)takayamaki