]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoImprove tests for JavaScript (#3496)
Yamagishi Kazutoshi [Thu, 1 Jun 2017 15:27:15 +0000 (00:27 +0900)]
Improve tests for JavaScript (#3496)

- Upgrade dependencies
    - chai (3.5.0 -> 4.0.1)
    - chai-enzyme (0.6.1 -> 0.7.1)
    - sinon (2.2.0 -> 2.3.2)
- Change extensions from .jsx to .js
- Don't assign `React` to `global`
- Check code format using ESLint

8 years agoAdd scenarios for log in (#3497)
Yamagishi Kazutoshi [Thu, 1 Jun 2017 15:25:59 +0000 (00:25 +0900)]
Add scenarios for log in (#3497)

8 years agoAdd ESLint rule (object-curly-spacing) (#3498)
Yamagishi Kazutoshi [Thu, 1 Jun 2017 15:25:10 +0000 (00:25 +0900)]
Add ESLint rule (object-curly-spacing) (#3498)

8 years agoRubocop changes (#3501)
Matt Jankowski [Thu, 1 Jun 2017 15:24:30 +0000 (11:24 -0400)]
Rubocop changes (#3501)

* Update renamed rubocop configuration options

* Remove duplicate rubocop configuration, sort options

8 years agoRemove usernames and hashtags from language detection (#3503)
Matt Jankowski [Thu, 1 Jun 2017 13:29:14 +0000 (09:29 -0400)]
Remove usernames and hashtags from language detection (#3503)

* Add failing specs for hashtag and username extraction in language detector

* Remove usernames and hashtags from text before language detection

* Handle multiple instances of special case, and reduce whitespace

8 years agoHandle nil and blank cases in Account finders (#3500)
Matt Jankowski [Thu, 1 Jun 2017 12:20:36 +0000 (08:20 -0400)]
Handle nil and blank cases in Account finders (#3500)

8 years agoFocus the submit button on the boost modal (#3494)
unarist [Thu, 1 Jun 2017 02:20:10 +0000 (11:20 +0900)]
Focus the submit button on the boost modal (#3494)

Focus the submit button when boost modal is opened.

8 years agoSpec coverage and refactor for the api/v1/accounts controllers (#3451)
Matt Jankowski [Wed, 31 May 2017 19:36:24 +0000 (15:36 -0400)]
Spec coverage and refactor for the api/v1/accounts controllers (#3451)

8 years agoMove admin/pubsubhubbub controller to admin/subscriptions (#3442)
Matt Jankowski [Wed, 31 May 2017 18:39:35 +0000 (14:39 -0400)]
Move admin/pubsubhubbub controller to admin/subscriptions (#3442)

8 years agoAdd Instance class to list admin records (#3443)
Matt Jankowski [Wed, 31 May 2017 18:38:44 +0000 (14:38 -0400)]
Add Instance class to list admin records (#3443)

8 years agoMisc tidying and clean ups (#3445)
Matt Jankowski [Wed, 31 May 2017 18:38:17 +0000 (14:38 -0400)]
Misc tidying and clean ups (#3445)

* Remove trailing whitespace in i18n mailers

* Use query methods instead of #present? on AR attributes

* Delegate Status#account_domain method

* Delegate Mention #account_username and #account_acct methods

8 years agoImprove spec coverage and clean up api/v1/blocks controller (#3464)
Matt Jankowski [Wed, 31 May 2017 18:34:51 +0000 (14:34 -0400)]
Improve spec coverage and clean up api/v1/blocks controller (#3464)

8 years agoImprove spec coverage and clean up api/v1/follow_requests controller (#3465)
Matt Jankowski [Wed, 31 May 2017 18:32:11 +0000 (14:32 -0400)]
Improve spec coverage and clean up api/v1/follow_requests controller (#3465)

8 years agoImprove spec coverage and clean up api/v1/domain_blocks controller (#3466)
Matt Jankowski [Wed, 31 May 2017 18:31:14 +0000 (14:31 -0400)]
Improve spec coverage and clean up api/v1/domain_blocks controller (#3466)

8 years agoRefactor api/v1/notifications controller (#3470)
Matt Jankowski [Wed, 31 May 2017 18:30:55 +0000 (14:30 -0400)]
Refactor api/v1/notifications controller (#3470)

8 years agoImprove spec coverage and clean up api/v1/favourites controller (#3472)
Matt Jankowski [Wed, 31 May 2017 18:30:39 +0000 (14:30 -0400)]
Improve spec coverage and clean up api/v1/favourites controller (#3472)

8 years agoExpand spec coverage and refactor the `Account.find_` methods (#3485)
Matt Jankowski [Wed, 31 May 2017 18:28:45 +0000 (14:28 -0400)]
Expand spec coverage and refactor the `Account.find_` methods (#3485)

* Move specs for account finder methods to concern spec

* Move account finder methods to concern

* Improve spec wording

* Use more explicit comparison to ensure correct return value

* Add coverage for .find_local! and .find_remote!

* Add some methods to the finder

* Use arel on matching_username method

* Avoid ternary in matching domain method

* Simplify finder methods

* Use an AccountFinder class to simplify lookup

8 years agoImprove spec coverage and clean up api/v1/mutes controller (#3481)
Matt Jankowski [Wed, 31 May 2017 18:27:34 +0000 (14:27 -0400)]
Improve spec coverage and clean up api/v1/mutes controller (#3481)

8 years agoRefactor and spec coverage for api/v1/timelines actions (#3482)
Matt Jankowski [Wed, 31 May 2017 18:27:17 +0000 (14:27 -0400)]
Refactor and spec coverage for api/v1/timelines actions (#3482)

8 years agoUpdate zh-TW.json (#3480)
caasi Huang [Wed, 31 May 2017 16:46:57 +0000 (00:46 +0800)]
Update zh-TW.json (#3480)

* Update zh-TW.json

* Update `search_results.total`

8 years agoHold value of I18n.locale with ApplicationHelperSpec (#3474)
Yamagishi Kazutoshi [Wed, 31 May 2017 15:09:28 +0000 (00:09 +0900)]
Hold value of I18n.locale with ApplicationHelperSpec (#3474)

8 years agoKeep ENV['LOCAL_HTTPS'] with ApplicationControllerSpec (fix random fail) (#3479)
Yamagishi Kazutoshi [Wed, 31 May 2017 15:09:17 +0000 (00:09 +0900)]
Keep ENV['LOCAL_HTTPS'] with ApplicationControllerSpec (fix random fail) (#3479)

* Keep ENV['LOCAL_HTTPS'] with ApplicationControllerSpec (fix random fail)

* use climate_control

8 years agoRemove react-imageloader (#3423)
Nolan Lawson [Wed, 31 May 2017 15:07:25 +0000 (08:07 -0700)]
Remove react-imageloader (#3423)

* Remove react-imageloader

* add eslint-disable-line

* improve image loading experience

* remove unneeded import

* use PureComponent

* Use componentWillMount instead of constructor

8 years agoFix load more on account timelines (regression from #3311) (#3475)
unarist [Wed, 31 May 2017 13:30:26 +0000 (22:30 +0900)]
Fix load more on account timelines (regression from #3311) (#3475)

This prevents `next` state from being overridden on the loading *new* statuses.

8 years agoImprove scheduling of requestIdleCallback tasks (#3477)
Nolan Lawson [Wed, 31 May 2017 13:11:33 +0000 (06:11 -0700)]
Improve scheduling of requestIdleCallback tasks (#3477)

8 years agoAccount.find_remote should be raise ActiveRecord::RecordNotFound (#3476)
alpaca-tc [Wed, 31 May 2017 13:10:26 +0000 (22:10 +0900)]
Account.find_remote should be raise ActiveRecord::RecordNotFound (#3476)

8 years agoRefactor api/v1/apps controller (#3471)
Matt Jankowski [Wed, 31 May 2017 01:16:28 +0000 (21:16 -0400)]
Refactor api/v1/apps controller (#3471)

8 years agoRefactor api/v1/reports controller (#3469)
Matt Jankowski [Wed, 31 May 2017 01:13:31 +0000 (21:13 -0400)]
Refactor api/v1/reports controller (#3469)

8 years agoRefactor api/v1/search controller (#3468)
Matt Jankowski [Wed, 31 May 2017 01:11:54 +0000 (21:11 -0400)]
Refactor api/v1/search controller (#3468)

8 years agoImprove spec coverage and clean up api/v1/media controller (#3467)
Matt Jankowski [Wed, 31 May 2017 01:11:29 +0000 (21:11 -0400)]
Improve spec coverage and clean up api/v1/media controller (#3467)

8 years agoClean up api/subscriptions controller (#3448)
Matt Jankowski [Wed, 31 May 2017 00:15:09 +0000 (20:15 -0400)]
Clean up api/subscriptions controller (#3448)

8 years agoCatalan language updates (#3454)
spla [Wed, 31 May 2017 00:14:52 +0000 (02:14 +0200)]
Catalan language updates (#3454)

* Add Catalan language

* Add Catalan language

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update settings_helper.rb

* Update mastodon.js

* Update index.js

* Update application.rb

* Update ca.yml

* removed extra spaces at line 225

* Catalan translation update

added activerecord.ca.yml

* Update activerecord.ca.yml

Done

* Updated activerecord.ca.yml

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Catalan language updated

8 years agoChange PureComponent to ImmutablePureComponent (#3460)
Yamagishi Kazutoshi [Wed, 31 May 2017 00:14:26 +0000 (09:14 +0900)]
Change PureComponent to ImmutablePureComponent (#3460)

* Change PureComponent to ImmutablePureComponent

Change PureComponent to ImmutablePureComponent in AttachmentList.

* rm React.

8 years agoAdd zh-TW.json (#3459)
Yamagishi Kazutoshi [Tue, 30 May 2017 21:09:02 +0000 (06:09 +0900)]
Add zh-TW.json (#3459)

8 years agoAdd status destroy authorization to policy (#3453)
Jack Jennings [Tue, 30 May 2017 20:56:31 +0000 (13:56 -0700)]
Add status destroy authorization to policy (#3453)

* Add status destroy authorization to policy

* Create explicit unreblog status authorization

8 years agoImprove api oembed controller (#3450)
Matt Jankowski [Tue, 30 May 2017 20:30:06 +0000 (16:30 -0400)]
Improve api oembed controller (#3450)

* Add StreamEntryFinder class to parse URLs

* Use StreamEntryFinder and clean up api/oembed controller

8 years agoClean up api/salmon controller (#3449)
Matt Jankowski [Tue, 30 May 2017 20:28:58 +0000 (16:28 -0400)]
Clean up api/salmon controller (#3449)

8 years agoFix incorrect visibility setter in StatusPolicySpec (#3456)
Jack Jennings [Tue, 30 May 2017 20:14:32 +0000 (13:14 -0700)]
Fix incorrect visibility setter in StatusPolicySpec (#3456)

8 years agoRemove exports/base controller in favor of shared concern (#3444)
Matt Jankowski [Tue, 30 May 2017 17:06:01 +0000 (13:06 -0400)]
Remove exports/base controller in favor of shared concern (#3444)

8 years agoadded 'https://' to CDN_HOST variable example (#3446)
Chris [Tue, 30 May 2017 16:39:28 +0000 (11:39 -0500)]
added 'https://' to CDN_HOST variable example (#3446)

8 years agoAdd "private: true" to package.json (#3441)
Yamagishi Kazutoshi [Tue, 30 May 2017 14:11:45 +0000 (23:11 +0900)]
Add "private: true" to package.json (#3441)

8 years agoFix webpack building on Windows (#3426)
Naouak [Tue, 30 May 2017 13:30:59 +0000 (15:30 +0200)]
Fix webpack building on Windows (#3426)

* Path should not be constructed manually. Use path.join to ensure compatibility.

* Path should not be constructed manually. Use path.join to ensure compatibility.

* Fix regexp.

* Fix my own stupidity.
I forgot to check outside my test script the regexp...

8 years agoRefactor User and spec (#3431)
Akihiko Odaki [Tue, 30 May 2017 13:28:56 +0000 (22:28 +0900)]
Refactor User and spec (#3431)

* Protect send_devise_notification of User

* Improve spec for User

8 years agoMove status reblog authorization into policy (#3425)
Jack Jennings [Tue, 30 May 2017 13:16:14 +0000 (06:16 -0700)]
Move status reblog authorization into policy (#3425)

8 years agoChange libraries path to relative (#3433)
Yamagishi Kazutoshi [Tue, 30 May 2017 13:13:04 +0000 (22:13 +0900)]
Change libraries path to relative (#3433)

8 years agoRemove unused React Storybook addon (#3434)
Yamagishi Kazutoshi [Tue, 30 May 2017 13:12:12 +0000 (22:12 +0900)]
Remove unused React Storybook addon (#3434)

8 years agoExtract polyfill loading into single module (#3421)
Nolan Lawson [Tue, 30 May 2017 13:11:15 +0000 (06:11 -0700)]
Extract polyfill loading into single module (#3421)

8 years agoUse around hook to restore context in InstancePresenter spec (#3430)
Akihiko Odaki [Tue, 30 May 2017 13:03:35 +0000 (22:03 +0900)]
Use around hook to restore context in InstancePresenter spec (#3430)

8 years agoUse around hook to restore context in InstanceHelper spec (#3429)
Akihiko Odaki [Tue, 30 May 2017 10:32:33 +0000 (19:32 +0900)]
Use around hook to restore context in InstanceHelper spec (#3429)

8 years agoUse around hook to restore context in Admin::SettingsController spec (#3428)
Akihiko Odaki [Tue, 30 May 2017 10:32:09 +0000 (19:32 +0900)]
Use around hook to restore context in Admin::SettingsController spec (#3428)

8 years agoUse around hook to restore context in ApplicationHelper spec (#3432)
Akihiko Odaki [Tue, 30 May 2017 10:29:48 +0000 (19:29 +0900)]
Use around hook to restore context in ApplicationHelper spec (#3432)

8 years agoRun bundle command (follow up #3403) (#3427)
Yamagishi Kazutoshi [Tue, 30 May 2017 01:04:44 +0000 (10:04 +0900)]
Run bundle command (follow up #3403) (#3427)

8 years agoUpdate dependencies of Node.js (#3067)
Yamagishi Kazutoshi [Mon, 29 May 2017 16:23:28 +0000 (01:23 +0900)]
Update dependencies of Node.js (#3067)

* Update autoprefixer to version 7.1.0

* Update axios to version 0.16.1

* Update babel-cli to version 6.24.1

* Update babel-eslint to version 7.2.3

* Update babel-preset-react to version 6.24.1

* Update coffee-script to version 1.12.6

* Update css-loader to version 0.28.1

* Update express to version 4.15.2

* Update js-yaml to version 3.8.4

* Update mocha to version 3.4.1

* Update jsdom to version 10.1.0

* Update npmlog to version 4.1.0

* Update postcss-smart-import to version 0.7.0

* Update postcss-loader to version 2.0.5

* Update pg to version 6.1.5

* Update prop-types to version 15.5.10

* Update rails-ujs to version 5.1.1

* Update redis to version 2.7.1

* Update sass-loader to version 6.0.5

* Update stringz to version 0.2.0

* Update webpack to version 2.5.1

* Update style-loader to version 0.17.0

* Update sinon to version 2.2.0

* Update react-motion to version 0.5.0

* Update react-notification to version 6.7.0

* Update react-redux-loading-bar to version 2.9.0

* Update react-intl to version 2.3.0

* Update redux-immutable to version 4.0.0

* Update reselect to version 3.0.1

* Update react-toggle to version 3.0.1

* Update react-simple-dropdown to version 3.0.0

* Update react-router to version 3.0.5

* Update react-router-scroll to version 0.4.2

* Update react-toggle to version 4.0.1

* yarn upgrade

8 years agoExtract authorization policy for viewing statuses (#3150)
Jack Jennings [Mon, 29 May 2017 16:22:22 +0000 (09:22 -0700)]
Extract authorization policy for viewing statuses (#3150)

8 years ago[RFC] Return 401 for an authentication error on WebSockets (#3411)
unarist [Mon, 29 May 2017 16:20:53 +0000 (01:20 +0900)]
[RFC] Return 401 for an authentication error on WebSockets (#3411)

* Return 401 for an authentication error on WebSocket

* Use upgradeReq instead of a custom object

8 years agoVersion bumps for non-rails gems (#3398)
Matt Jankowski [Mon, 29 May 2017 16:18:06 +0000 (12:18 -0400)]
Version bumps for non-rails gems (#3398)

* Update xpath to version 2.1.0

* Update aws-sdk to version 2.9.25

* Update oj to version 3.0.10

* Update brakeman to version 3.6.2

* Update rufus-scheduler to version 3.4.2

* Update doorkeeper to version 4.2.6

* Update rubocop to version 0.49.0

8 years agoAdd IntersectionObserverWrapper to cut down on re-renders (#3406)
Nolan Lawson [Mon, 29 May 2017 16:17:51 +0000 (09:17 -0700)]
Add IntersectionObserverWrapper to cut down on re-renders (#3406)

8 years agoRemove methods from ObfuscateFilename and spec (#3347)
Akihiko Odaki [Mon, 29 May 2017 16:14:16 +0000 (01:14 +0900)]
Remove methods from ObfuscateFilename and spec (#3347)

* Remove methods from ObfuscateFilename

* Spec ObfuscateFilename

8 years agoSpec Auth::ConfirmationsController (#3348)
Akihiko Odaki [Mon, 29 May 2017 16:13:11 +0000 (01:13 +0900)]
Spec Auth::ConfirmationsController (#3348)

8 years agoSpec AccountControllerConcern (#3349)
Akihiko Odaki [Mon, 29 May 2017 16:12:54 +0000 (01:12 +0900)]
Spec AccountControllerConcern (#3349)

8 years agoCover Admin::ReportsController more (#3346)
Akihiko Odaki [Mon, 29 May 2017 16:12:34 +0000 (01:12 +0900)]
Cover Admin::ReportsController more (#3346)

8 years agoCover InstancesController more (#3342)
Akihiko Odaki [Mon, 29 May 2017 16:12:17 +0000 (01:12 +0900)]
Cover InstancesController more (#3342)

8 years agoCover Admin::SuspensionsController more (#3350)
Akihiko Odaki [Mon, 29 May 2017 16:11:16 +0000 (01:11 +0900)]
Cover Admin::SuspensionsController more (#3350)

8 years agoSpec Auth::PasswordsController (#3352)
Akihiko Odaki [Mon, 29 May 2017 16:10:50 +0000 (01:10 +0900)]
Spec Auth::PasswordsController (#3352)

8 years agoSpec Admin::ResetsController calls send_reset_password_instructions (#3354)
Akihiko Odaki [Mon, 29 May 2017 16:09:17 +0000 (01:09 +0900)]
Spec Admin::ResetsController calls send_reset_password_instructions (#3354)

8 years agoSpec #destroy feature of Admin::TwoFactorAuthenticationsController (#3355)
Akihiko Odaki [Mon, 29 May 2017 16:08:58 +0000 (01:08 +0900)]
Spec #destroy feature of Admin::TwoFactorAuthenticationsController (#3355)

8 years agoCoever Admin::SilencesController more (#3356)
Akihiko Odaki [Mon, 29 May 2017 16:08:42 +0000 (01:08 +0900)]
Coever Admin::SilencesController more (#3356)

8 years agoCover Settings::ExportsController more (#3358)
Akihiko Odaki [Mon, 29 May 2017 16:08:26 +0000 (01:08 +0900)]
Cover Settings::ExportsController more (#3358)

8 years agoCover Oauth::AuthorizedApplicationsController (#3359)
Akihiko Odaki [Mon, 29 May 2017 16:08:05 +0000 (01:08 +0900)]
Cover Oauth::AuthorizedApplicationsController (#3359)

8 years agoCover Oauth::AuthorizationsController more (#3361)
Akihiko Odaki [Mon, 29 May 2017 16:07:39 +0000 (01:07 +0900)]
Cover Oauth::AuthorizationsController more (#3361)

8 years agoCover Settings::TwoFactorAuthenticationsController more (#3376)
Akihiko Odaki [Mon, 29 May 2017 16:07:07 +0000 (01:07 +0900)]
Cover Settings::TwoFactorAuthenticationsController more (#3376)

8 years agoCover WellKnown::HostMetaController more (#3382)
Akihiko Odaki [Mon, 29 May 2017 16:05:30 +0000 (01:05 +0900)]
Cover WellKnown::HostMetaController more (#3382)

8 years agoCover Settings::TwoFactorAuthentication::RecoveryCodesController more (#3383)
Akihiko Odaki [Mon, 29 May 2017 16:05:20 +0000 (01:05 +0900)]
Cover Settings::TwoFactorAuthentication::RecoveryCodesController more (#3383)

8 years agoSpec Settings::Exports (#3384)
Akihiko Odaki [Mon, 29 May 2017 16:05:01 +0000 (01:05 +0900)]
Spec Settings::Exports (#3384)

* Spec output of Settings::Exports::BlockedAccountsController

* Spec output of Settings::Exports::FollowingAccountsController

* Spec output of Settings::Exports::MutedAccountsController

* Spec Settings::Exports::BaseController

This commit removes duplicate specs in classes inheriting
Settings::Exports::BaseController as well.

8 years agoCover WellKnown::WebfingerController more (#3385)
Akihiko Odaki [Mon, 29 May 2017 16:04:37 +0000 (01:04 +0900)]
Cover WellKnown::WebfingerController more (#3385)

8 years agoCover Settings::TwoFactorAuthentication::ConfirmationsController more (#3386)
Akihiko Odaki [Mon, 29 May 2017 16:04:00 +0000 (01:04 +0900)]
Cover Settings::TwoFactorAuthentication::ConfirmationsController more (#3386)

8 years agoCover ApplicationHelper more (#3412)
Akihiko Odaki [Mon, 29 May 2017 16:03:37 +0000 (01:03 +0900)]
Cover ApplicationHelper more (#3412)

8 years agoSpec Activitystreams2BuilderHelper (#3413)
Akihiko Odaki [Mon, 29 May 2017 16:03:15 +0000 (01:03 +0900)]
Spec Activitystreams2BuilderHelper (#3413)

8 years agoSpec FlashesHelper (#3414)
Akihiko Odaki [Mon, 29 May 2017 16:03:02 +0000 (01:03 +0900)]
Spec FlashesHelper (#3414)

8 years agoSpec HomeHelper (#3415)
Akihiko Odaki [Mon, 29 May 2017 16:02:44 +0000 (01:02 +0900)]
Spec HomeHelper (#3415)

8 years agoSpec HttpHelper (#3416)
Akihiko Odaki [Mon, 29 May 2017 16:02:32 +0000 (01:02 +0900)]
Spec HttpHelper (#3416)

8 years agoCover Admin::PubSubHubHubController more (#3343)
Akihiko Odaki [Mon, 29 May 2017 16:01:37 +0000 (01:01 +0900)]
Cover Admin::PubSubHubHubController more (#3343)

8 years agoDon't stream toots from users who have blocked the recipient user (#3300)
unarist [Mon, 29 May 2017 16:01:08 +0000 (01:01 +0900)]
Don't stream toots from users who have blocked the recipient user (#3300)

* Don't stream toots from users who have blocked the recipient user

This filter was already applied on the `/api/v1/timelines/public` API, but
not yet for the Streaming API.

* Boosted status' account_id doesn't need for filtering in streaming/index.js

This filtering is only for public/hashtag timelines, but boosts already filtered on FanOutOnWriteService because those timelines don't show boosts.

8 years ago[nanobox] Adjustments for Nanobox development (#3295)
Daniel Hunsaker [Mon, 29 May 2017 15:59:18 +0000 (09:59 -0600)]
[nanobox] Adjustments for Nanobox development (#3295)

Because Nanobox doesn't run data components in the same container as the code, there are a few tweaks that need to be made in the configuration to get WebPack to work properly in development mode.

The same differences lead to needing to use `DATABASE_URL` by default in the `.env` file for Rails to work correctly.

Limitations of our `.env` loader for Node.js mean the `.env` file needs to be compiled everywhere in order to work, so we compile it in development, now, too. Also, all the `.env.production` tweaks have been consolidated into a single command.

Finally, since Nanobox actually creates the database when it sets up the database server, using the existence of the database alone to determine whether to migrate or setup is insufficient. So we add a condition to `rake db:migrate:setup` to check whether any migrations have run - if the database doesn't exist yet, `db:setup` will be called; if it does, but no migrations have been run, `db:migrate` and `db:seed` are called instead (the same basic idea as what `db:setup` does, but it skips `db:create`, which will only cause problems with an existing DB); otherwise, only `db:migrate` is called.

None of these changes should affect development, and all are designed not to interfere with existing behaviors in other environments.

8 years agoAdd preference setting for delete toot modal (#3368)
Atsushi Yamamoto [Mon, 29 May 2017 15:56:13 +0000 (11:56 -0400)]
Add preference setting for delete toot modal (#3368)

* Set delete_modal preference to true by default
* Does not show confirmation modal if delete_modal is false
* Add ja translation for preference setting page

8 years agoPrevent wasted render in load_more.js (#3402)
Nolan Lawson [Mon, 29 May 2017 15:52:45 +0000 (08:52 -0700)]
Prevent wasted render in load_more.js (#3402)

8 years agofix-rails-minor-version (#3403)
masarakki [Mon, 29 May 2017 15:52:26 +0000 (00:52 +0900)]
fix-rails-minor-version (#3403)

8 years agol10n: Fix Japanese translation (#3410)
lindwurm [Mon, 29 May 2017 15:52:02 +0000 (00:52 +0900)]
l10n: Fix Japanese translation (#3410)

* "メデイア" -> "メディア"

Signed-off-by: lindwurm <lindwurm.q@gmail.com>
8 years agoUse travis_retry to reduce spurious test failures (#3418)
Nolan Lawson [Mon, 29 May 2017 15:49:54 +0000 (08:49 -0700)]
Use travis_retry to reduce spurious test failures (#3418)

8 years agoBump version to 1.4.1
Eugen Rochko [Sun, 28 May 2017 17:30:38 +0000 (19:30 +0200)]
Bump version to 1.4.1

8 years agoUse immutable list in UploadButton to avoid wasteful re-render (#3394)
Nolan Lawson [Sun, 28 May 2017 17:15:35 +0000 (10:15 -0700)]
Use immutable list in UploadButton to avoid wasteful re-render (#3394)

8 years agoRe-add stream end log for WebSocket (#3397)
Clworld [Sun, 28 May 2017 17:14:44 +0000 (02:14 +0900)]
Re-add stream end log for WebSocket (#3397)

8 years agoFix video having black border on top due to regression from #2608 (#3392)
Eugen Rochko [Sun, 28 May 2017 17:11:47 +0000 (19:11 +0200)]
Fix video having black border on top due to regression from #2608 (#3392)

The combination of object-fit, relative position 50% from top and translating it
back upwards 50% is what allows us to crop the video properly, so it needs to
be +50%-50%

8 years agoUkrainian translation: fix typo (#3393)
ster [Sun, 28 May 2017 17:11:29 +0000 (21:11 +0400)]
Ukrainian translation: fix typo (#3393)

8 years agoFix IntersectionObserver isIntersecting in Edge (#3365)
Nolan Lawson [Sun, 28 May 2017 14:45:42 +0000 (07:45 -0700)]
Fix IntersectionObserver isIntersecting in Edge (#3365)

8 years agoBump version to 1.4.0.6
Eugen Rochko [Sun, 28 May 2017 14:32:53 +0000 (16:32 +0200)]
Bump version to 1.4.0.6

8 years agoUpdate bootsnap to 0.3.0 (fix xattr.h error) (#3390)
Eugen Rochko [Sun, 28 May 2017 14:32:29 +0000 (16:32 +0200)]
Update bootsnap to 0.3.0 (fix xattr.h error) (#3390)

8 years agoSimplify isIntersecting in status_list.js (#3371)
Nolan Lawson [Sun, 28 May 2017 14:26:35 +0000 (07:26 -0700)]
Simplify isIntersecting in status_list.js (#3371)

8 years agoFix Webpack Bundle Analyzer output for Webpacker (#3374)
Akihiko Odaki [Sun, 28 May 2017 14:26:16 +0000 (23:26 +0900)]
Fix Webpack Bundle Analyzer output for Webpacker (#3374)

Webpacker failed to parse output of Webpack when a module requires
non-existent module or has similar errors. This commit fixes the bug.

8 years agoi18n: Add some tags for Chinese translation (#3379)
vidarlee [Sun, 28 May 2017 14:25:54 +0000 (23:25 +0900)]
i18n: Add some tags for Chinese translation (#3379)

* Enhance for the Chinese translation

* Add filtered_languages for Chinese Translation include CN/HK/TW for PR #3175

* i18n: Add some tags for Chinese translation

* i18n: Add some tags for Chinese translation