3681 Commits (117eb3b2bc9253bed6c8df245a1df65404cedeb6)

 

All Branches   

Search

Author	SHA1	Message	Date
Eugen Rochko	177dd8bb53	Fix regression from #3592 - validation condition nesting (#3644)	8 years ago
Eugen Rochko	380b20eed6	Bump version to 1.4.2	8 years ago
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	8 years ago
Eugen Rochko	b87eb8ea14	Fix #3378 - If favourite/reblog already exists, return it instead of failing (#3641)	8 years ago
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	8 years ago
nullkal	b8ea28d6d0	Support multiple trusted proxy ip addresses (#3639) ... * Support multiple trusted proxy ip addresses * correct coding style	8 years ago
ThibG	f741673638	Fixes #3605 by returning account from database in case of race condition (#3606)	8 years ago
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.	8 years ago
Yamagishi Kazutoshi	7d2b4186c3	Add Japanese translations (#3635)	8 years ago
m4sk1n	90689190a3	i18n: Update Polish translation (#3637)	8 years ago
Sorin Davidoi	8acadeea76	fix: Warn if JavaScript is disabled (#3634)	8 years ago
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	8 years ago
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	8 years ago
jeroenpraat	92bb166246	Rest of 2FA translated + small fix (#3630)	8 years ago
Sorin Davidoi	8cf8ce4ac0	fix(components/autosuggest_textarea): Race condition regarding onBlur (#3631)	8 years ago
unarist	0f1b1d78b1	Use "match_array" only for order independent assertions (#3626)	8 years ago
Eugen Rochko	d3bbef27e7	Fix broken screenshot	8 years ago
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	8 years ago
Yamagishi Kazutoshi	1d68fe1a60	Fix Code Climate failed (regression from #3622) (#3624)	8 years ago
unarist	6bd6dcf6df	Allow "class" attribute on the "a" tag in sanitization (#3623) ... This preserves `<a ... class="u-url mention">` from other Mastodon instances.	8 years ago
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.	8 years ago
Yamagishi Kazutoshi	34bfea8bbf	Small changes to japanese translation (#3620)	8 years ago
STJrInuyasha	2d91944285	Don't show business e-mail if it's blank (#3619)	8 years ago
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.	8 years ago
Eugen Rochko	b623dd12c1	Use preview image in <ImageLoader /> to provide immediate visual feedback (#3595) ... before the full-size image is loaded	8 years ago
Eugen Rochko	722d152082	Fix #3063 - Add dynamic app manifest (#3563) ... * Fix #3063 - Add dynamic app manifest * Added short_name * Add background_color	8 years ago
ふぁぼ原	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	8 years ago
unarist	e34c5a3503	Fix 500 errors on searching invalid URLs (#3613)	8 years ago
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.	8 years ago
Yamagishi Kazutoshi	ad4a28f4f6	Refactor translationRunner.js (#3604) ... - Use yargs instead of minimist - Simplify validators - Fix typo (RFC5626 -> RFC5646)	8 years ago
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	8 years ago
Yamagishi Kazutoshi	cd81a1c52a	Add missing key attribute to .search-results__hashtag (#3607)	8 years ago
May Kittens Devour Your Soul	dcf73ddeff	Update hr.json (#3609)	8 years ago
Yamagishi Kazutoshi	d81b706f12	Fix typo (storyboard -> storybook) (#3603)	8 years ago
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.	8 years ago
Yamagishi Kazutoshi	7a7bfa5170	Add quotes ESLint rules (#3602) ... * Add quotes ESLint rule * Add jsx-quotes ESlint rule * Sort ESLint rules	8 years ago
Yamagishi Kazutoshi	e969c78645	Disable ESLint rule jsx/anchor-has-content (#3601)	8 years ago
ThibG	7adac1bc51	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	8 years ago
Naoki Kosaka	e859d6f259	Fix LoadMore in Notifications. (#3590)	8 years ago
Naoki Kosaka	a0880edc6e	Fix (PR #3585) Add hasMore to propTypes and cover handleScroll. (#3589)	8 years ago
unarist	61fcdbbf7e	Add back button to hashtag timeline again (#3587)	8 years ago
Shunsuke Michii	43af695ba1	Add th.json. (#3588)	8 years ago
IkUrA	facd90e7a6	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	8 years ago
Matt Jankowski	6201f96b8a	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	8 years ago
unarist	c26cea262b	Prevent pinned columns from scroll to top on URL changing (#3586)	8 years ago
Naoki Kosaka	1f1d6bf2a0	Fix LoadMore in following and followers. (#3585)	8 years ago
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