4035 Commits (8185f988723dd95b814bcc5f03ccb3da94edbae4)

 

All Branches   

Search

Author	SHA1	Message	Date
Eugen Rochko	4c06d1cb24	Fix #3550 - Add all missing foreign keys (#3562) ... * Fix #3550 - Add all missing foreign keys * Add missing foreign keys	8 years ago
Daigo 3 Dango	2985d08951	Redirect to streaming_api_base_url (#3579) ... * 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	8 years ago
Yamagishi Kazutoshi	66ca7157db	Add support key shortcut to Onboarding Modal (#3517) ... * Add support key shortcut to Onboarding Modal * this.state.pages -> this.pages	8 years ago
Yamagishi Kazutoshi	4addf051d4	Fix broken embed page (#3577)	8 years ago
Yamagishi Kazutoshi	ab914ce6d5	Add OnboadingModal story (#3578)	8 years ago
Yamagishi Kazutoshi	6a4b224397	Fix randomly fail (regression from #3560) (#3580)	8 years ago
Yamagishi Kazutoshi	6adbd114c1	Skip image length check (regression from #3528) (#3581)	8 years ago
René Klačan	037f96c5ae	Don't follow account if it's already followed (#3575) ... Closes https://github.com/tootsuite/mastodon/issues/3102	8 years ago
René Klačan	f54dca06a9	Add migration versions (#3574) ... 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.	8 years ago
Quent-in	370fa70924	l10n update for occitan language (#3557) ... * 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	8 years ago
Matt Jankowski	5be1214c26	Gem version bumps (#3524) ... * 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	8 years ago
Eugen Rochko	f7a30e2fae	Added support for configurable reserved usernames (fix of #1382) (#3566) ... * Added support for configurable reserved usernames * Added reserved usernames from mastodon issue 1355 * Fix reserved usernames	8 years ago
Yamagishi Kazutoshi	3f815b2052	Add date to ignore_missing and ignore_unused in config/i18n-tasks.yml (#3572)	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	defe4f9bc3	Cover WebfingerResource more (#3560)	8 years ago
Yamagishi Kazutoshi	943775fd90	Update dependencies of Node.js (#3561) ... * 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	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	42844df966	Spec ScopedSettings (#3559)	8 years ago
Yamagishi Kazutoshi	b0fe58dc69	Upgrade storybook to v3 (#3558)	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	e07b57852e	Remove some code in TagManager and spec (#3547) ... * Do not fall back to StreamEntry if object_type is unavailable in TagManager Since 6d6a429af8, 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	8 years ago
m4sk1n	7c7c18fdea	i18n: Updated Polish translation (#3555)	8 years ago
lindwurm	a84664026e	l10n: ja: Change about/more link text (#3539) ... ref: #3538 ("Extended information" -> "About this instance") and #3519 Signed-off-by: lindwurm <lindwurm.q@gmail.com>	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	02a0fd5b64	Spec InlineRablScope (#3542)	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	6505a42be0	Spec HashObject (#3544)	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	e674608d10	A minor change for ProviderDiscovery and spec (#3543) ... * 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	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	c7af8cbc90	Remove some arguments of Formatter.instance.format and spec (#3541) ... * Remove some arguments of Formatter.instance.format * Improve spec for Formatter	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	9475fbae78	Spec Extractor (#3540)	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	00e61d6807	Spec action verification of StreamEntryFinder (#3549)	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	19084d3c6c	Remove Targetable (#3548)	8 years ago
Naoki Kosaka	e014bf8ed0	Fix limit_param in favourites_controller.rb (#3553)	8 years ago
Yamagishi Kazutoshi	f6e2309e70	Fix column buttons overflow in Japanese (#3552)	8 years ago
Yamagishi Kazutoshi	9d2154c4ab	Add Japanese translations (pin) (#3551) ... * Add Japanese translations (pin) * "ピン留め" is more general	8 years ago
unarist	1dfd27a028	Fix all icons in the column header being hilighted (#3554)	8 years ago
Mingye Wang	b97ebaf620	en.json: change about/more link text to "About this instance" (#3538) ... This change follows #3519, which does the same for the Chinese variants. Or should it be simply "About"?	8 years ago
Eugen Rochko	8ee2eb5d2e	Allow mounting arbitrary columns (#3207) ... * 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	8 years ago
masarakki	20b647020b	refocus-after-toot (#3537)	8 years ago
takayamaki	3eedad2737	change sidekiq queueing to bulk push (#3536)	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	ce7c0def88	Remove redundant code in AtomSerializer and spec (#3528) ... * Remove redundant status.reply? in AtomSerializer#object * Cover AtomSerializer more	8 years ago
Clworld	dab8fc4584	Execute PushUpdateWorker only for accounts who uses StreamingAPI just now. (#3278) ... * Add redis key "subscribed:timeline:#{account.id}" to indicate active streaming API listeners exists. * Add endpoint for notification only stream. * Run PushUpdateWorker only for users uses Streaming API now. * Move close hander streamTo(Http/Ws) -> stream(Http/Ws)End (Deal with #3370) * Add stream type for stream start log message.	8 years ago
Yamagishi Kazutoshi	8a597f0138	Cache assets in travis (#3532)	8 years ago
Nolan Lawson	3363f2f4d6	Fix isIntersecting in Chrome (#3525)	8 years ago
Mingye Wang	c7f2d6af55	zh-cn&tw.json: "extended info" -> "about this site" (#3519) ... * zh-cn.json: "additional info" -> "more info" This commit changes the "extended info" (about/more) text to something that translates to "more info", as "additional info" in zh can sound like appending things to the (ugh) navbar, I guess. Or should I just change it to "about this site" (关于本站)? * zh-cn.json: navbar.info -> "about this site" * zh-臺灣.json: navbar.info -> "about this site"	8 years ago
Yamagishi Kazutoshi	e878ddb7c0	Fix spec for #2388 (#3526)	8 years ago
Yamagishi Kazutoshi	336f0b0823	Remove WarmCacheService (#3527) ... WarmCacheService is no longer used (removed with 5442083b3c ).	8 years ago
Yamagishi Kazutoshi	3ea3f24a02	Change toggle state when click label (#3530)	8 years ago
ThibG	d567a382e3	Ensure well_known controllers use WEB_DOMAIN by including RoutingHelper (#2388) ... This fixes #2375.	8 years ago
Clworld	18fe77084f	bump rails version in Gemfile: '~> 5.0.0' -> '~> 5.1.0' (#3523)	8 years ago
Naoki Kosaka	dc253ea234	Ignore packs folder when COPY . /mastodon (#3522)	8 years ago
Sorin Davidoi	9304114b57	Ignore .idea folder (#3516) ... Used by Intellij IDEA / WebStorm / RubyMine.	8 years ago
Matt Jankowski	1fd5251376	Add index to media_attachments.account_id (#3510)	8 years ago
Nolan Lawson	edddc7c791	Enable stats.json analysis with Webpack Visualizer (#3509)	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	10768aa204	Spec response for forgery (#3248) ... Remove protect_from_forgery in ApiController, which is disabled by the following skip_before_action, as well.	8 years ago