nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,694 Commits 18 Branches 0 Tags 78 MiB
Commit Graph

3694 Commits

Author SHA1 Message Date
m4sk1n 778430b54a i18n: Minor fixes in Polish translation (#3674) 
* i18n

* i18n

* i18n

* i18n

* i18n
 2017-06-09 23:08:09 +02:00
Matt Jankowski 5282ba862a 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
 2017-06-09 14:12:40 -04:00
Eugen Rochko 0464602978 Fix issue with some Node.js versions not having Array.prototype.includes (#3667) 
by using Array.prototype.indexOf instead
 2017-06-09 19:46:33 +02:00
Eugen Rochko 9b03cf0ddd Fix #3658 - Update RTL styles (#3669) 2017-06-09 19:46:25 +02:00
Eugen Rochko cdff1da901 Correct validators so that existing error messages would look correct (#3668) 2017-06-09 19:46:01 +02:00
m4sk1n 1a065fb146 i18n: updated Polish translation (#3670) 2017-06-09 19:15:55 +02:00
Matt Jankowski 022008a2a6 Language detection defaults to nil (#3666) 
* Default to nil for statuses.language

* Language detection defaults to nil instead of instance UI default
 2017-06-09 18:09:37 +02:00
Clworld a3715598cc adjust the size of 'column-header__back-button' (retry) (#3662) 2017-06-09 16:22:28 +02:00
Yamagishi Kazutoshi 1be48dd805 Refactor views/admin/reports/show.html.haml (#3656) 2017-06-09 15:08:06 +02:00
Yamagishi Kazutoshi 6384041d17 Add includes to Report#statuses (#3655) 2017-06-09 15:07:02 +02:00
Yamagishi Kazutoshi 140e73bc82 Check ready state of document in public pages (#3652) 
* Check ready state of document in public pages

* add check interactive
 2017-06-09 15:06:38 +02:00
ふぁぼ原 e3fae6f52c adjust the size of column-header__back-button (#3654) 2017-06-09 15:05:26 +02:00
unarist 65d8c73bae Add Japanese translation for #3640 (#3650) 2017-06-09 03:14:15 +02:00
Eugen Rochko 177dd8bb53 Fix regression from #3592 - validation condition nesting (#3644) 2017-06-08 19:10:48 +02:00
Eugen Rochko 380b20eed6 Bump version to 1.4.2 2017-06-08 15:30:43 +02:00
Eugen Rochko c207b4bb33 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
 2017-06-08 09:22:01 -04:00
Eugen Rochko b87eb8ea14 Fix #3378 - If favourite/reblog already exists, return it instead of failing (#3641) 2017-06-08 15:07:39 +02:00
Eugen Rochko 8902e265b4 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
 2017-06-08 14:58:22 +02:00
nullkal b8ea28d6d0 Support multiple trusted proxy ip addresses (#3639) 
* Support multiple trusted proxy ip addresses

* correct coding style
 2017-06-08 14:33:28 +02:00
ThibG f741673638 Fixes #3605 by returning account from database in case of race condition (#3606) 2017-06-08 13:40:11 +02:00
Yamagishi Kazutoshi 0a0b9a271a Improve RuboCop rules (compatibility to Code Climate) (#3636) 
08f8de84eb/Gemfile.lock (L38)
Code Climate is using RuboCop v0.46.0.

Change several rules to maintain compatibility.
 2017-06-08 13:24:28 +02:00
Yamagishi Kazutoshi 7d2b4186c3 Add Japanese translations (#3635) 2017-06-08 13:23:56 +02:00
m4sk1n 90689190a3 i18n: Update Polish translation (#3637) 2017-06-08 13:23:40 +02:00
Sorin Davidoi 8acadeea76 fix: Warn if JavaScript is disabled (#3634) 2017-06-08 00:52:56 +02:00
Eugen Rochko 75c6513c67 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
 2017-06-07 20:16:53 +02:00
Matt Jankowski 73540ffe6b 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
 2017-06-07 20:09:25 +02:00
jeroenpraat 92bb166246 Rest of 2FA translated + small fix (#3630) 2017-06-07 20:08:34 +02:00
Sorin Davidoi 8cf8ce4ac0 fix(components/autosuggest_textarea): Race condition regarding onBlur (#3631) 2017-06-07 20:05:53 +02:00
unarist 0f1b1d78b1 Use "match_array" only for order independent assertions (#3626) 2017-06-07 12:59:28 -04:00
Eugen Rochko d3bbef27e7 Fix broken screenshot 2017-06-07 17:53:47 +02:00
Matt Jankowski f0634ba876 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
 2017-06-07 17:23:26 +02:00
Yamagishi Kazutoshi 1d68fe1a60 Fix Code Climate failed (regression from #3622) (#3624) 2017-06-07 15:57:59 +02:00
unarist 6bd6dcf6df Allow "class" attribute on the "a" tag in sanitization (#3623) 
This preserves `<a ... class="u-url mention">` from other Mastodon instances.
 2017-06-07 15:57:30 +02:00
ThibG 28d2920472 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.
 2017-06-07 12:28:16 +02:00
Yamagishi Kazutoshi 34bfea8bbf Small changes to japanese translation (#3620) 2017-06-07 10:15:35 +02:00
STJrInuyasha 2d91944285 Don't show business e-mail if it's blank (#3619) 2017-06-07 09:57:47 +02:00
Daigo 3 Dango 0026ba2751 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.
 2017-06-06 20:43:02 +02:00
Eugen Rochko b623dd12c1 Use preview image in <ImageLoader /> to provide immediate visual feedback (#3595) 
before the full-size image is loaded
 2017-06-06 19:30:17 +02:00
Eugen Rochko 722d152082 Fix #3063 - Add dynamic app manifest (#3563) 
* Fix #3063 - Add dynamic app manifest

* Added short_name

* Add background_color
 2017-06-06 19:29:42 +02:00
ふぁぼ原 7623766241 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
 2017-06-06 16:56:10 +02:00
unarist e34c5a3503 Fix 500 errors on searching invalid URLs (#3613) 2017-06-06 16:44:48 +02:00
unarist 004672aa6c 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.
 2017-06-06 16:07:06 +02:00
Yamagishi Kazutoshi ad4a28f4f6 Refactor translationRunner.js (#3604) 
- Use yargs instead of minimist
- Simplify validators
- Fix typo (RFC5626 -> RFC5646)
 2017-06-06 13:31:57 +02:00
Yamagishi Kazutoshi d8ae3efec3 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
 2017-06-06 13:20:07 +02:00
Yamagishi Kazutoshi cd81a1c52a Add missing key attribute to .search-results__hashtag (#3607) 2017-06-06 13:19:29 +02:00
May Kittens Devour Your Soul dcf73ddeff Update hr.json (#3609) 2017-06-06 13:19:05 +02:00
Yamagishi Kazutoshi d81b706f12 Fix typo (storyboard -> storybook) (#3603) 2017-06-06 04:07:34 +02:00
m4sk1n 30fa5fe1a4 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.
 2017-06-06 03:59:13 +02:00
Yamagishi Kazutoshi 7a7bfa5170 Add quotes ESLint rules (#3602) 
* Add quotes ESLint rule

* Add jsx-quotes ESlint rule

* Sort ESLint rules
 2017-06-06 03:56:36 +02:00
Yamagishi Kazutoshi e969c78645 Disable ESLint rule jsx/anchor-has-content (#3601) 2017-06-06 03:55:56 +02:00