about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-06-12Regenerate defaultMessages.json (#3709)Yamagishi Kazutoshi
follow up #3564
2017-06-12Re-add clear notifications button (#3708)Yamagishi Kazutoshi
* Re-add clear notifications button * remove connect() in column_settings * one line * remove unused props
2017-06-12Fix locale related specs (#3707)unarist
* Use I18n.locale instead of ":en" * Reset I18n.locale value after locale changing tests
2017-06-12Update dependencies for Node.js (#3705)Yamagishi Kazutoshi
* Update @storybook/addon-actions to v3.1.2 * Update @storybook/react to v3.1.2 * Update babel-core to v6.25.0 * Update babel-preset-env to v1.5.2 * Update chai to version v4.0.2 * Update extract-text-webpack-plugin to v2.1.2 * Update file-loader to v0.11.2 * Update intersection-observer to v0.3.0 * Update pg to v6.2.4 * Update sinon to v2.3.4 * Update style-loader to v0.18.2 * Update websocket.js to v0.1.10 * Update react-redux-loading-bar to v2.9.2 * yarn upgrade
2017-06-12Fix regression from #3672 - Do not use pipeline around zscore (#3704)Eugen Rochko
2017-06-11Fix an error when TagManager.local_url? is called with a bad URI (#3701)ThibG
TagManager.local_url? was sometimes called with an URI with a nil host, leading to a crash in TagManager.local_url?. This fixes moves the already-existing uri.host.blank? check in front to avoid this case.
2017-06-11Fix #3582 - Update OStatus2 gem (#3699)Eugen Rochko
2017-06-11Fix removal of status sending the original status to mentioned users instead ↵Eugen Rochko
of delete Salmon (#3672) * Fix removal of status sending the original status to mentioned users instead of delete Salmon, add test * Create remove_status_service_spec.rb
2017-06-11Fix #3665 - Refactor timelines reducer (#3686)Eugen Rochko
* Move ancestors/descendants out of timelines reducer * Refactor timelines reducer All types of timelines now have a flat structure and use the same reducer functions and actions * Reintroduce some missing behaviours * Fix wrong import in reports * Fix includes typo * Fix issue related to "next" pagination in timelines and notifications * Fix bug with timeline's initial state, expandNotifications
2017-06-11Fix Account model deprecation warnings (#3689)René Klačan
``` DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails. The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now). To maintain the current behavior, use `saved_change_to_attribute?` instead. (called from block in <class:Account> at /Users/rene/Workspace/personal/ruby/mastodon/app/models/account.rb:60) DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails. The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now). To maintain the current behavior, use `saved_change_to_attribute?` instead. (called from block in <class:Account> at /Users/rene/Workspace/personal/ruby/mastodon/app/models/account.rb:60) DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails. The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now). To maintain the current behavior, use `saved_change_to_attribute?` instead. (called from block in <class:Account> at /Users/rene/Workspace/personal/ruby/mastodon/app/models/account.rb:60) DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails. The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now). To maintain the current behavior, use `saved_change_to_attribute?` instead. (called from block in <class:Account> at /Users/rene/Workspace/personal/ruby/mastodon/app/models/account.rb:61) DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails. The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now). To maintain the current behavior, use `saved_change_to_attribute?` instead. (called from block in <class:Account> at /Users/rene/Workspace/personal/ruby/mastodon/app/models/account.rb:62) DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails. The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now). To maintain the current behavior, use `saved_change_to_attribute?` instead. (called from block in <class:Account> at /Users/rene/Workspace/personal/ruby/mastodon/app/models/account.rb:63) ``` Here's PR describing changes to Dirty API https://github.com/rails/rails/pull/25337
2017-06-11Localize date in digest and cover NotificationMailer more (#3694)Akihiko Odaki (@fn_aki@pawoo.net)
* Localize date in digest * Cover NotificationMailer more
2017-06-11Update Russian translation (#3692)Ratmir Karabut
2017-06-11Remove comments for eslint-disable (#3691)Yamagishi Kazutoshi
2017-06-11Refactor UpdateRemoteProfileService (#3690)Yamagishi Kazutoshi
2017-06-11Make sure email is case insensitive on all places (#3688)René Klačan
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
2017-06-10Gem versions, including security-related mail gem update (#3687)Matt Jankowski
* 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
2017-06-10Update NL for 1.4.2 (#3685)Jeroen
2017-06-10Improve RTL detection (#3682)Eugen Rochko
- Use plaintext - Strip out URLs - Strip out mentions - Strip out hashtags - Strip out whitespace from "overall" count - Consistent between JS and Ruby
2017-06-10Improve default language decision and spec (#3351)Akihiko Odaki (@fn_aki@pawoo.net)
* 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
2017-06-10Move create/destroy actions for api/v1/statuses to namespace (#3678)Matt Jankowski
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
2017-06-09i18n: Minor fixes in Polish translation (#3674)m4sk1n
* i18n * i18n * i18n * i18n * i18n
2017-06-09Move reblogged_by and favourited_by actions out of api/v1/statuses and into ↵Matt Jankowski
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-09Fix issue with some Node.js versions not having Array.prototype.includes (#3667)Eugen Rochko
by using Array.prototype.indexOf instead
2017-06-09Fix #3658 - Update RTL styles (#3669)Eugen Rochko
2017-06-09Correct validators so that existing error messages would look correct (#3668)Eugen Rochko
2017-06-09i18n: updated Polish translation (#3670)m4sk1n
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