]>
cat aescling's git repositories - mastodon.git/log
Ratmir Karabut [Sun, 11 Jun 2017 08:43:01 +0000 (11:43 +0300)]
Update Russian translation (#3692)
Yamagishi Kazutoshi [Sun, 11 Jun 2017 08:42:42 +0000 (17:42 +0900)]
Remove comments for eslint-disable (#3691)
Yamagishi Kazutoshi [Sun, 11 Jun 2017 08:41:59 +0000 (17:41 +0900)]
Refactor UpdateRemoteProfileService (#3690)
René Klačan [Sun, 11 Jun 2017 00:29:08 +0000 (02:29 +0200)]
Make sure email is case insensitive on all places (#3688)
When case insensitivity is enabled via devise's `config.case_insensitive_keys` then `.find_for_authentication` method needs to be used instead of `.find_by` because second mentioned returns `nil` when valid email with different cases is passed.
More info https://github.com/plataformatec/devise/wiki/How-To:-Use-case-insensitive-emails
Matt Jankowski [Sat, 10 Jun 2017 18:26:50 +0000 (14:26 -0400)]
Gem versions, including security-related mail gem update (#3687)
* Update mail to version 2.6.6
* Update aws-sdk to version 2.9.37
* Update capybara to version 2.14.2
* Update oj to version 3.1.0
* Update sidekiq to version 5.0.2
* Update puma to version 3.9.1
* Update sanitize to version 4.5.0
* Update capistrano-rails to version 1.3.0
Jeroen [Sat, 10 Jun 2017 15:26:01 +0000 (17:26 +0200)]
Update NL for 1.4.2 (#3685)
Eugen Rochko [Sat, 10 Jun 2017 13:06:50 +0000 (15:06 +0200)]
Improve RTL detection (#3682)
- Use plaintext
- Strip out URLs
- Strip out mentions
- Strip out hashtags
- Strip out whitespace from "overall" count
- Consistent between JS and Ruby
Akihiko Odaki (@fn_aki@pawoo.net) [Sat, 10 Jun 2017 07:44:02 +0000 (16:44 +0900)]
Improve default language decision and spec (#3351)
* Improve default language decision
This change allows to takes account of accepted language determined by
the user agent even if the custom default locale of the instance is
configured.
* Cover Localized more
* Fix code style
Matt Jankowski [Sat, 10 Jun 2017 07:39:26 +0000 (03:39 -0400)]
Move create/destroy actions for api/v1/statuses to namespace (#3678)
Each of mute, favourite, reblog has been updated to:
- Have a separate controller with just a create and destroy action
- Preserve historical route names to not break the API
- Mild refactoring to break up long methods
m4sk1n [Fri, 9 Jun 2017 21:08:09 +0000 (23:08 +0200)]
i18n: Minor fixes in Polish translation (#3674)
* i18n
* i18n
* i18n
* i18n
* i18n
Matt Jankowski [Fri, 9 Jun 2017 18:12:40 +0000 (14:12 -0400)]
Move reblogged_by and favourited_by actions out of api/v1/statuses and into unique controllers (#3646)
* Add specs for api statuses routes
* Update favourited_by and reblogged_by api routes
* Move methods into new controllers
* Use load_accounts methods to simplify index actions
* Clean up load_accounts methods
* Clean up link header generation
* Check for link headers in specs
* Remove unused actions from api/v1/statuses controller
* Remove specs for moved actions
Eugen Rochko [Fri, 9 Jun 2017 17:46:33 +0000 (19:46 +0200)]
Fix issue with some Node.js versions not having Array.prototype.includes (#3667)
by using Array.prototype.indexOf instead
Eugen Rochko [Fri, 9 Jun 2017 17:46:25 +0000 (19:46 +0200)]
Fix #3658 - Update RTL styles (#3669)
Eugen Rochko [Fri, 9 Jun 2017 17:46:01 +0000 (19:46 +0200)]
Correct validators so that existing error messages would look correct (#3668)
m4sk1n [Fri, 9 Jun 2017 17:15:55 +0000 (19:15 +0200)]
i18n: updated Polish translation (#3670)
Matt Jankowski [Fri, 9 Jun 2017 16:09:37 +0000 (12:09 -0400)]
Language detection defaults to nil (#3666)
* Default to nil for statuses.language
* Language detection defaults to nil instead of instance UI default
Clworld [Fri, 9 Jun 2017 14:22:28 +0000 (23:22 +0900)]
adjust the size of 'column-header__back-button' (retry) (#3662)
Yamagishi Kazutoshi [Fri, 9 Jun 2017 13:08:06 +0000 (22:08 +0900)]
Refactor views/admin/reports/show.html.haml (#3656)
Yamagishi Kazutoshi [Fri, 9 Jun 2017 13:07:02 +0000 (22:07 +0900)]
Add includes to Report#statuses (#3655)
Yamagishi Kazutoshi [Fri, 9 Jun 2017 13:06:38 +0000 (22:06 +0900)]
Check ready state of document in public pages (#3652)
* Check ready state of document in public pages
* add check interactive
ふぁぼ原 [Fri, 9 Jun 2017 13:05:26 +0000 (22:05 +0900)]
adjust the size of column-header__back-button (#3654)
unarist [Fri, 9 Jun 2017 01:14:15 +0000 (10:14 +0900)]
Add Japanese translation for #3640 (#3650)
Eugen Rochko [Thu, 8 Jun 2017 17:10:48 +0000 (19:10 +0200)]
Fix regression from #3592 - validation condition nesting (#3644)
Eugen Rochko [Thu, 8 Jun 2017 13:30:43 +0000 (15:30 +0200)]
Bump version to 1.4.2
Eugen Rochko [Thu, 8 Jun 2017 13:22:01 +0000 (15:22 +0200)]
Fix db:seed - only run some validations when the field was changed (#3592)
* Fix db:seed - only run some validations when the field was changed
* Add tests
Eugen Rochko [Thu, 8 Jun 2017 13:07:39 +0000 (15:07 +0200)]
Fix #3378 - If favourite/reblog already exists, return it instead of failing (#3641)
Eugen Rochko [Thu, 8 Jun 2017 12:58:22 +0000 (14:58 +0200)]
Add explit admin actions to (re)subscribe/unsubscribe remote accounts (#3640)
* Add explit admin actions to (re)subscribe/unsubscribe remote accounts
and re-download avatar/header
* Improve how admin NSFW toggle looks
nullkal [Thu, 8 Jun 2017 12:33:28 +0000 (21:33 +0900)]
Support multiple trusted proxy ip addresses (#3639)
* Support multiple trusted proxy ip addresses
* correct coding style
ThibG [Thu, 8 Jun 2017 11:40:11 +0000 (13:40 +0200)]
Fixes #3605 by returning account from database in case of race condition (#3606)
Yamagishi Kazutoshi [Thu, 8 Jun 2017 11:24:28 +0000 (20:24 +0900)]
Improve RuboCop rules (compatibility to Code Climate) (#3636)
https://github.com/codeclimate/codeclimate-rubocop/blob/
08f8de84ebfb39caa96391e23816877278f6441c /Gemfile.lock#L38
Code Climate is using RuboCop v0.46.0.
Change several rules to maintain compatibility.
Yamagishi Kazutoshi [Thu, 8 Jun 2017 11:23:56 +0000 (20:23 +0900)]
Add Japanese translations (#3635)
m4sk1n [Thu, 8 Jun 2017 11:23:40 +0000 (13:23 +0200)]
i18n: Update Polish translation (#3637)
Sorin Davidoi [Wed, 7 Jun 2017 22:52:56 +0000 (00:52 +0200)]
fix: Warn if JavaScript is disabled (#3634)
Eugen Rochko [Wed, 7 Jun 2017 18:16:53 +0000 (20:16 +0200)]
Add rake task to prepare database for foreign keys introduced by #3562 (#3614)
* Add rake task to prepare database for foreign keys introduced by #3562
* Fix typo
* Do not delete OAuth values where NULL values may be permitted
* Fix typo
Matt Jankowski [Wed, 7 Jun 2017 18:09:25 +0000 (14:09 -0400)]
Clean up for api/base controller (#3629)
* Move ApiController to Api/BaseController
* API controllers inherit from Api::BaseController
* Add coverage for various error cases in api/base controller
jeroenpraat [Wed, 7 Jun 2017 18:08:34 +0000 (20:08 +0200)]
Rest of 2FA translated + small fix (#3630)
Sorin Davidoi [Wed, 7 Jun 2017 18:05:53 +0000 (20:05 +0200)]
fix(components/autosuggest_textarea): Race condition regarding onBlur (#3631)
unarist [Wed, 7 Jun 2017 16:59:28 +0000 (01:59 +0900)]
Use "match_array" only for order independent assertions (#3626)
Eugen Rochko [Wed, 7 Jun 2017 15:53:47 +0000 (17:53 +0200)]
Fix broken screenshot
Matt Jankowski [Wed, 7 Jun 2017 15:23:26 +0000 (11:23 -0400)]
Coverage improvement and concern extraction for rate limit headers in API controller (#3625)
* Coverage for rate limit headers
* Move rate limit headers methods to concern
* Move throttle check to condition on before_action
* Move match_data variable into method
* Move utc timestamp to separate method
* Move header setting into smaller methods
* specs cleanup
Yamagishi Kazutoshi [Wed, 7 Jun 2017 13:57:59 +0000 (22:57 +0900)]
Fix Code Climate failed (regression from #3622) (#3624)
unarist [Wed, 7 Jun 2017 13:57:30 +0000 (22:57 +0900)]
Allow "class" attribute on the "a" tag in sanitization (#3623)
This preserves `<a ... class="u-url mention">` from other Mastodon instances.
ThibG [Wed, 7 Jun 2017 10:28:16 +0000 (12:28 +0200)]
Fixes #3388 by moving re-entrant `shared_status_from_xml` before transaction block (#3622)
Steps to reproduce the original issue:
1. Have two remote accounts, A that you don't follow, and B that you follow.
2. Have A post a toot and reply to it.
3. Boost A's reply from remote account B.
This used to cause the local instance to get A's reply but fail to link it to
the original post.
Yamagishi Kazutoshi [Wed, 7 Jun 2017 08:15:35 +0000 (17:15 +0900)]
Small changes to japanese translation (#3620)
STJrInuyasha [Wed, 7 Jun 2017 07:57:47 +0000 (00:57 -0700)]
Don't show business e-mail if it's blank (#3619)
Daigo 3 Dango [Tue, 6 Jun 2017 18:43:02 +0000 (18:43 +0000)]
Update nokogumbo to 1.4.13 (#3617)
$ bundle update --source nokogumbo# Please enter the commit message for your changes. Lines starting
nokogumbo 1.4.11 and 1.4.12 don't work on Heroku.
Eugen Rochko [Tue, 6 Jun 2017 17:30:17 +0000 (19:30 +0200)]
Use preview image in <ImageLoader /> to provide immediate visual feedback (#3595)
before the full-size image is loaded
Eugen Rochko [Tue, 6 Jun 2017 17:29:42 +0000 (19:29 +0200)]
Fix #3063 - Add dynamic app manifest (#3563)
* Fix #3063 - Add dynamic app manifest
* Added short_name
* Add background_color
ふぁぼ原 [Tue, 6 Jun 2017 14:56:10 +0000 (23:56 +0900)]
Add regex filters on the community timeline and the public timeline. (#3564)
* Add regex filter on the community timeline and the public timeline
* correcting
* Adjust the height of header buttons
* Remove trailing spaces
* Remove trailing spaces
* Solve some code duplication
* reset the state of the locale files in app/javascript/mastodon/locales
* adjust to upstream
* adjust to upstream
* change keys of locale settings
unarist [Tue, 6 Jun 2017 14:44:48 +0000 (23:44 +0900)]
Fix 500 errors on searching invalid URLs (#3613)
unarist [Tue, 6 Jun 2017 14:07:06 +0000 (23:07 +0900)]
Fix tag search order and not to use tsvector (#3611)
* Sort results by the name
* Switch search method to simple `LIKE` matching instead of tsvector/tsquery
Previously we used scores from ts_rank_cd() to sort results, but it didn't work
because the function returns same score for all results. It's not for calculate
similarity of single words. Sometimes this bug even push out exact matching tag
from results.
Additionally, PostgreSQL supports prefix searching with standard btree index.
Using it offers simpler code, but also less index size and some speed.
Yamagishi Kazutoshi [Tue, 6 Jun 2017 11:31:57 +0000 (20:31 +0900)]
Refactor translationRunner.js (#3604)
- Use yargs instead of minimist
- Simplify validators
- Fix typo (RFC5626 -> RFC5646)
Yamagishi Kazutoshi [Tue, 6 Jun 2017 11:20:07 +0000 (20:20 +0900)]
Improve ESLint rules for JSX (#3608)
* Add react/no-string-refs ESLint rule
* Add react/jsx-boolean-value ESLint rule
* Add react/jsx-closing-bracket-location ESLint rule
* Add react/jsx-indent ESLint rule
* Add react/jsx-curly-spacing ESLint rule
* Add react/jsx-equals-spacing ESLint rule
* Add react/jsx-first-prop-new-line ESLint rule
* Add react/jsx-no-duplicate-props ESLint rule
* Add react/jsx-tag-spacing ESLint rule
Yamagishi Kazutoshi [Tue, 6 Jun 2017 11:19:29 +0000 (20:19 +0900)]
Add missing key attribute to .search-results__hashtag (#3607)
May Kittens Devour Your Soul [Tue, 6 Jun 2017 11:19:05 +0000 (13:19 +0200)]
Update hr.json (#3609)
Yamagishi Kazutoshi [Tue, 6 Jun 2017 02:07:34 +0000 (11:07 +0900)]
Fix typo (storyboard -> storybook) (#3603)
m4sk1n [Tue, 6 Jun 2017 01:59:13 +0000 (03:59 +0200)]
i18n: updated Polish translation (#3597)
* 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.
Yamagishi Kazutoshi [Tue, 6 Jun 2017 01:56:36 +0000 (10:56 +0900)]
Add quotes ESLint rules (#3602)
* Add quotes ESLint rule
* Add jsx-quotes ESlint rule
* Sort ESLint rules
Yamagishi Kazutoshi [Tue, 6 Jun 2017 01:55:56 +0000 (10:55 +0900)]
Disable ESLint rule jsx/anchor-has-content (#3601)
ThibG [Mon, 5 Jun 2017 22:09:14 +0000 (00:09 +0200)]
Try fixing ThreadResolveWorker calls (#3599)
* 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
Naoki Kosaka [Mon, 5 Jun 2017 17:18:26 +0000 (02:18 +0900)]
Fix LoadMore in Notifications. (#3590)
Naoki Kosaka [Mon, 5 Jun 2017 16:18:56 +0000 (01:18 +0900)]
Fix (PR #3585) Add hasMore to propTypes and cover handleScroll. (#3589)
unarist [Mon, 5 Jun 2017 15:10:40 +0000 (00:10 +0900)]
Add back button to hashtag timeline again (#3587)
Shunsuke Michii [Mon, 5 Jun 2017 15:02:41 +0000 (00:02 +0900)]
Add th.json. (#3588)
IkUrA [Mon, 5 Jun 2017 14:37:44 +0000 (23:37 +0900)]
Add streaming_api_base_url to /api/v1/instance (#3556)
* Add streaming_api_base_url to /api/v1/instance
* Adjust spaces
* nested view
* re-adjust spaces
Matt Jankowski [Mon, 5 Jun 2017 14:07:44 +0000 (10:07 -0400)]
Introduce StatusThreadingConcern (#3490)
* Add a StatusFilter class to identify visibility of statuses by accounts
* Extract StatusThreadingConcern from Status
* Clarify purpose of checking for nil account
unarist [Mon, 5 Jun 2017 13:20:46 +0000 (22:20 +0900)]
Prevent pinned columns from scroll to top on URL changing (#3586)
Naoki Kosaka [Mon, 5 Jun 2017 12:13:20 +0000 (21:13 +0900)]
Fix LoadMore in following and followers. (#3585)
Eugen Rochko [Mon, 5 Jun 2017 11:24:00 +0000 (13:24 +0200)]
Fix #3550 - Add all missing foreign keys (#3562)
* Fix #3550 - Add all missing foreign keys
* Add missing foreign keys
Daigo 3 Dango [Mon, 5 Jun 2017 10:09:29 +0000 (10:09 +0000)]
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
Yamagishi Kazutoshi [Mon, 5 Jun 2017 08:09:14 +0000 (17:09 +0900)]
Add support key shortcut to Onboarding Modal (#3517)
* Add support key shortcut to Onboarding Modal
* this.state.pages -> this.pages
Yamagishi Kazutoshi [Mon, 5 Jun 2017 08:08:31 +0000 (17:08 +0900)]
Fix broken embed page (#3577)
Yamagishi Kazutoshi [Mon, 5 Jun 2017 08:08:07 +0000 (17:08 +0900)]
Add OnboadingModal story (#3578)
Yamagishi Kazutoshi [Mon, 5 Jun 2017 08:03:36 +0000 (17:03 +0900)]
Fix randomly fail (regression from #3560) (#3580)
Yamagishi Kazutoshi [Mon, 5 Jun 2017 08:03:01 +0000 (17:03 +0900)]
Skip image length check (regression from #3528) (#3581)
René Klačan [Mon, 5 Jun 2017 01:24:18 +0000 (03:24 +0200)]
Don't follow account if it's already followed (#3575)
Closes https://github.com/tootsuite/mastodon/issues/3102
René Klačan [Mon, 5 Jun 2017 00:43:02 +0000 (02:43 +0200)]
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.
Quent-in [Sun, 4 Jun 2017 23:31:10 +0000 (01:31 +0200)]
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
Matt Jankowski [Sun, 4 Jun 2017 23:10:13 +0000 (19:10 -0400)]
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
Eugen Rochko [Sun, 4 Jun 2017 23:03:45 +0000 (01:03 +0200)]
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
Yamagishi Kazutoshi [Sun, 4 Jun 2017 23:02:19 +0000 (08:02 +0900)]
Add date to ignore_missing and ignore_unused in config/i18n-tasks.yml (#3572)
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 15:13:37 +0000 (00:13 +0900)]
Cover WebfingerResource more (#3560)
Yamagishi Kazutoshi [Sun, 4 Jun 2017 15:13:21 +0000 (00:13 +0900)]
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
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 15:07:39 +0000 (00:07 +0900)]
Spec ScopedSettings (#3559)
Yamagishi Kazutoshi [Sun, 4 Jun 2017 14:26:07 +0000 (23:26 +0900)]
Upgrade storybook to v3 (#3558)
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 14:14:25 +0000 (23:14 +0900)]
Remove some code in TagManager and spec (#3547)
* 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
m4sk1n [Sun, 4 Jun 2017 13:18:42 +0000 (15:18 +0200)]
i18n: Updated Polish translation (#3555)
lindwurm [Sun, 4 Jun 2017 13:00:15 +0000 (22:00 +0900)]
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>
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 13:00:08 +0000 (22:00 +0900)]
Spec InlineRablScope (#3542)
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 12:59:52 +0000 (21:59 +0900)]
Spec HashObject (#3544)
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 12:59:40 +0000 (21:59 +0900)]
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
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 12:58:57 +0000 (21:58 +0900)]
Remove some arguments of Formatter.instance.format and spec (#3541)
* Remove some arguments of Formatter.instance.format
* Improve spec for Formatter
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 12:57:02 +0000 (21:57 +0900)]
Spec Extractor (#3540)
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 12:56:31 +0000 (21:56 +0900)]
Spec action verification of StreamEntryFinder (#3549)
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 12:56:10 +0000 (21:56 +0900)]
Remove Targetable (#3548)
Naoki Kosaka [Sun, 4 Jun 2017 12:52:26 +0000 (21:52 +0900)]
Fix limit_param in favourites_controller.rb (#3553)
Yamagishi Kazutoshi [Sun, 4 Jun 2017 12:52:02 +0000 (21:52 +0900)]
Fix column buttons overflow in Japanese (#3552)
Yamagishi Kazutoshi [Sun, 4 Jun 2017 12:51:35 +0000 (21:51 +0900)]
Add Japanese translations (pin) (#3551)
* Add Japanese translations (pin)
* "ピン留め" is more general
unarist [Sun, 4 Jun 2017 12:51:06 +0000 (21:51 +0900)]
Fix all icons in the column header being hilighted (#3554)
Mingye Wang [Sun, 4 Jun 2017 02:25:18 +0000 (22:25 -0400)]
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"?