about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-06-09Language detection defaults to nil (#3666)Matt Jankowski
* Default to nil for statuses.language * Language detection defaults to nil instead of instance UI default
2017-06-09adjust the size of 'column-header__back-button' (retry) (#3662)Clworld
2017-06-09Refactor views/admin/reports/show.html.haml (#3656)Yamagishi Kazutoshi
2017-06-09Add includes to Report#statuses (#3655)Yamagishi Kazutoshi
2017-06-09Check ready state of document in public pages (#3652)Yamagishi Kazutoshi
* Check ready state of document in public pages * add check interactive
2017-06-09adjust the size of column-header__back-button (#3654)ふぁぼ原
2017-06-09Add Japanese translation for #3640 (#3650)unarist
2017-06-08Fix regression from #3592 - validation condition nesting (#3644)Eugen Rochko
2017-06-08Bump version to 1.4.2Eugen Rochko
2017-06-08Fix db:seed - only run some validations when the field was changed (#3592)Eugen Rochko
* Fix db:seed - only run some validations when the field was changed * Add tests
2017-06-08Fix #3378 - If favourite/reblog already exists, return it instead of failing ↵Eugen Rochko
(#3641)
2017-06-08Add explit admin actions to (re)subscribe/unsubscribe remote accounts (#3640)Eugen Rochko
* Add explit admin actions to (re)subscribe/unsubscribe remote accounts and re-download avatar/header * Improve how admin NSFW toggle looks
2017-06-08Support multiple trusted proxy ip addresses (#3639)nullkal
* Support multiple trusted proxy ip addresses * correct coding style
2017-06-08Fixes #3605 by returning account from database in case of race condition (#3606)ThibG
2017-06-08Improve RuboCop rules (compatibility to Code Climate) (#3636)Yamagishi Kazutoshi
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.
2017-06-08Add Japanese translations (#3635)Yamagishi Kazutoshi
2017-06-08i18n: Update Polish translation (#3637)m4sk1n
2017-06-08fix: Warn if JavaScript is disabled (#3634)Sorin Davidoi
2017-06-07Add rake task to prepare database for foreign keys introduced by #3562 (#3614)Eugen Rochko
* 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-07Clean up for api/base controller (#3629)Matt Jankowski
* Move ApiController to Api/BaseController * API controllers inherit from Api::BaseController * Add coverage for various error cases in api/base controller
2017-06-07Rest of 2FA translated + small fix (#3630)jeroenpraat
2017-06-07fix(components/autosuggest_textarea): Race condition regarding onBlur (#3631)Sorin Davidoi
2017-06-07Use "match_array" only for order independent assertions (#3626)unarist
2017-06-07Fix broken screenshotEugen Rochko
2017-06-07Coverage improvement and concern extraction for rate limit headers in API ↵Matt Jankowski
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-07Fix Code Climate failed (regression from #3622) (#3624)Yamagishi Kazutoshi
2017-06-07Allow "class" attribute on the "a" tag in sanitization (#3623)unarist
This preserves `<a ... class="u-url mention">` from other Mastodon instances.
2017-06-07Fixes #3388 by moving re-entrant `shared_status_from_xml` before transaction ↵ThibG
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-07Small changes to japanese translation (#3620)Yamagishi Kazutoshi
2017-06-07Don't show business e-mail if it's blank (#3619)STJrInuyasha
2017-06-06Update nokogumbo to 1.4.13 (#3617)Daigo 3 Dango
$ 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-06Use preview image in <ImageLoader /> to provide immediate visual feedback ↵Eugen Rochko
(#3595) before the full-size image is loaded
2017-06-06Fix #3063 - Add dynamic app manifest (#3563)Eugen Rochko
* Fix #3063 - Add dynamic app manifest * Added short_name * Add background_color
2017-06-06Add 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-06Fix 500 errors on searching invalid URLs (#3613)unarist
2017-06-06Fix tag search order and not to use tsvector (#3611)unarist
* 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-06Refactor translationRunner.js (#3604)Yamagishi Kazutoshi
- Use yargs instead of minimist - Simplify validators - Fix typo (RFC5626 -> RFC5646)
2017-06-06Improve ESLint rules for JSX (#3608)Yamagishi Kazutoshi
* 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-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