]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoDisplay list column (#5750)
Eugen Rochko [Fri, 24 Nov 2017 23:35:37 +0000 (00:35 +0100)]
Display list column (#5750)

8 years agoFix unnecessary order (#5807)
abcang [Fri, 24 Nov 2017 17:41:07 +0000 (02:41 +0900)]
Fix unnecessary order (#5807)

8 years agoDon't remove originals of boosted toots from timeline (#5479)
sdukhovni [Fri, 24 Nov 2017 13:43:53 +0000 (08:43 -0500)]
Don't remove originals of boosted toots from timeline (#5479)

* Don't remove originals of boosted toots from timeline

* Remove unused argument to updateTimeline

8 years agoAdd tests for Streamable (#5771)
ysksn [Fri, 24 Nov 2017 13:42:57 +0000 (22:42 +0900)]
Add tests for Streamable (#5771)

8 years agoAdd index of account and reblog to statuses (#5785)
abcang [Fri, 24 Nov 2017 13:42:09 +0000 (22:42 +0900)]
Add index of account and reblog to statuses (#5785)

8 years agoAdd tests for AccountRelationshipsPresenter (#5805)
ysksn [Fri, 24 Nov 2017 13:41:04 +0000 (22:41 +0900)]
Add tests for AccountRelationshipsPresenter (#5805)

8 years agoi18n: Update ja translations (#5804)
mayaeh [Fri, 24 Nov 2017 12:14:31 +0000 (21:14 +0900)]
i18n: Update ja translations (#5804)

* Add Japanese translations.

* Update Japanese translations.

* Fix japanese translation.

8 years agoDo not require onClose property in NavigationBar (#5802)
Akihiko Odaki [Fri, 24 Nov 2017 12:13:17 +0000 (21:13 +0900)]
Do not require onClose property in NavigationBar (#5802)

NavigationBar can be used as mock as it is in OnboardingModal. In such a
case, onClose property is not required.

8 years agoAdd logging of admin actions (#5757)
Eugen Rochko [Fri, 24 Nov 2017 01:05:53 +0000 (02:05 +0100)]
Add logging of admin actions (#5757)

* Add logging of admin actions

* Update brakeman whitelist

* Log creates, updates and destroys with history of changes

* i18n: Update Polish translation (#5782)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* Split admin navigation into moderation and administration

* Redesign audit log page

* 🇵🇱 (#5795)

* Add color coding to audit log

* Change dismiss->resolve, log all outcomes of report as resolve

* Update terminology (e-mail blacklist) (#5796)

* Update terminology (e-mail blacklist)

imho looks better

* Update en.yml

* Fix code style issues

* i18n-tasks normalize

8 years agoDisable Code Climate maintainability checks (#5798)
Devon Blandin [Thu, 23 Nov 2017 20:38:17 +0000 (15:38 -0500)]
Disable Code Climate maintainability checks (#5798)

- Migrate `.codeclimate.yml` to version 2 structure
- Disable Code Climate [maintainability checks][]

https://docs.codeclimate.com/docs/advanced-configuration

[maintainability checks]: http://blog.codeclimate.com/blog/2017/10/12/10-point-technical-debt-assessment

This commit upgrades the Code Climate configuration file and disables
the new maintainability checks.

Once this PR is merged, we can experiment with the new checks via pull
requests (the PR will report new issues) or via the [Code Climate
CLI][cli], which [now also supports the new maintainability
checks][cli-support].

[cli]: https://github.com/codeclimate/codeclimate
[cli-support]: https://codeclimate.com/changelog/5a0e488824cfa902a300091c

8 years agoi18n: (zh-CN) Add translations for #5746 & #5735 (#5764)
SerCom_KC [Thu, 23 Nov 2017 01:49:21 +0000 (09:49 +0800)]
i18n: (zh-CN) Add translations for #5746 & #5735 (#5764)

8 years agoAdd Japanese translations. (#5769)
mayaeh [Tue, 21 Nov 2017 16:11:33 +0000 (01:11 +0900)]
Add Japanese translations. (#5769)

8 years agoUpdate and fix Catalan translation (#5773)
Joan Montané [Tue, 21 Nov 2017 14:17:28 +0000 (15:17 +0100)]
Update and fix Catalan translation (#5773)

* Update activerecord.ca.yml

* Update ca.yml

* Update devise.ca.yml

* Update doorkeeper.ca.yml

* Update simple_form.ca.yml

* fix syntax error for ca translation

* fix syntax errors in ca translations

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoAdd tests for Remotable (#5768)
ysksn [Tue, 21 Nov 2017 04:59:36 +0000 (13:59 +0900)]
Add tests for Remotable (#5768)

8 years agoFixed duplicating URL of photo type of oEmbed (#5763)
abcang [Mon, 20 Nov 2017 19:45:54 +0000 (04:45 +0900)]
Fixed duplicating URL of photo type of oEmbed (#5763)

8 years agoFix NoMethodError at ActivityPub::FetchRemoteStatusService (#5753)
abcang [Sun, 19 Nov 2017 14:33:15 +0000 (23:33 +0900)]
Fix NoMethodError at ActivityPub::FetchRemoteStatusService (#5753)

8 years agoFix N+1 at notification (#5752)
abcang [Sun, 19 Nov 2017 14:32:48 +0000 (23:32 +0900)]
Fix N+1 at notification (#5752)

8 years agoi18n: Update ja translation for moderator badge. (#5731)
mayaeh [Sun, 19 Nov 2017 03:16:56 +0000 (12:16 +0900)]
i18n: Update ja translation for moderator badge. (#5731)

* Update Japanese translation for moderator badge.

* Follows English notation

8 years agoAdd tests for AccountInteractions (#5751)
ysksn [Sun, 19 Nov 2017 03:16:14 +0000 (12:16 +0900)]
Add tests for AccountInteractions (#5751)

* Add tests for class methods of AccountInteractions

* Add tests for instance methods of AccountInteractions

8 years agoRemove translations of default theme (#5741)
Lynx Kotoura [Sun, 19 Nov 2017 03:15:50 +0000 (12:15 +0900)]
Remove translations of default theme (#5741)

8 years agoAdd a test for Settings::Extend#settings (#5720)
ysksn [Sun, 19 Nov 2017 03:15:32 +0000 (12:15 +0900)]
Add a test for Settings::Extend#settings (#5720)

8 years agoAdd tests for Status#title (#5718)
ysksn [Sun, 19 Nov 2017 03:15:17 +0000 (12:15 +0900)]
Add tests for Status#title (#5718)

8 years agoAdd “staff” badge to admin user pages (#5735)
Yamagishi Kazutoshi [Sun, 19 Nov 2017 03:13:57 +0000 (12:13 +0900)]
Add “staff” badge to admin user pages (#5735)

* Allow staff badge to change from setting to hidden

* i18n: Update Polish translation

8 years agoi18n: Update Polish translation (#5749)
Marcin Mikołajczak [Sat, 18 Nov 2017 20:43:10 +0000 (21:43 +0100)]
i18n: Update Polish translation (#5749)

8 years agoProfile redirect notes (#5746)
Eugen Rochko [Sat, 18 Nov 2017 18:39:02 +0000 (19:39 +0100)]
Profile redirect notes (#5746)

* Serialize moved accounts into REST and ActivityPub APIs

* Parse federated moved accounts from ActivityPub

* Add note about moved accounts to public profiles

* Add moved account message to web UI

* Fix code style issues

8 years agoUpdating Chinese (Simplified) translations (#5725)
SerCom_KC [Sat, 18 Nov 2017 05:35:11 +0000 (13:35 +0800)]
Updating Chinese (Simplified) translations (#5725)

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Change `静音` to `隐藏`

* i18n: (zh-CN) Add translations for #5087 & #5669

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Add missing translation for #5728

8 years agoMake it possible to bind streming service to 0.0.0.0 (#5744)
Baptiste Gelez [Sat, 18 Nov 2017 03:44:19 +0000 (04:44 +0100)]
Make it possible to bind streming service to 0.0.0.0 (#5744)

8 years agoLists (#5703)
Eugen Rochko [Fri, 17 Nov 2017 23:16:48 +0000 (00:16 +0100)]
Lists (#5703)

* Add structure for lists

* Add list timeline streaming API

* Add list APIs, bind list-account relation to follow relation

* Add API for adding/removing accounts from lists

* Add pagination to lists API

* Add pagination to list accounts API

* Adjust scopes for new APIs

- Creating and modifying lists merely requires "write" scope
- Fetching information about lists merely requires "read" scope

* Add test for wrong user context on list timeline

* Clean up tests

8 years agoIncrease contrast of Admin badges (#5740)
Lynx Kotoura [Fri, 17 Nov 2017 18:59:53 +0000 (03:59 +0900)]
Increase contrast of Admin badges (#5740)

To comply WCAG 2.0 guidelines on contrast ratio.

8 years agoFix regression #5467: fixes emoji copy (#5739)
Clworld [Fri, 17 Nov 2017 17:22:31 +0000 (02:22 +0900)]
Fix regression #5467: fixes emoji copy (#5739)

8 years agoChange libinconv download URL to HTTPS (#5738)
Alex Coto [Fri, 17 Nov 2017 17:21:05 +0000 (12:21 -0500)]
Change libinconv download URL to HTTPS (#5738)

8 years agoMove "Permissions" row into main table in /admin/accounts/:id (#5734)
unarist [Fri, 17 Nov 2017 14:18:20 +0000 (23:18 +0900)]
Move "Permissions" row into main table in /admin/accounts/:id (#5734)

8 years agoRedirect to reports when moderator (#5733)
Yamagishi Kazutoshi [Fri, 17 Nov 2017 02:26:34 +0000 (11:26 +0900)]
Redirect to reports when moderator (#5733)

8 years agoRemove empty strings (#5732)
ysksn [Fri, 17 Nov 2017 01:52:30 +0000 (10:52 +0900)]
Remove empty strings (#5732)

8 years agoFix some rubocop style issues (#5730)
Eugen Rochko [Fri, 17 Nov 2017 01:06:26 +0000 (02:06 +0100)]
Fix some rubocop style issues (#5730)

8 years agoDisplay moderator badge (green), admin badge changed to red (#5728)
Eugen Rochko [Fri, 17 Nov 2017 00:22:38 +0000 (01:22 +0100)]
Display moderator badge (green), admin badge changed to red (#5728)

8 years agoImprove language filter (#5724)
Renato "Lond" Cerqueira [Thu, 16 Nov 2017 12:51:38 +0000 (10:51 -0200)]
Improve language filter (#5724)

* Scrub text of html before detecting language.

* Detect language on statuses coming from activitypub.

* Fix rubocop comments.

* Remove custom emoji from text before language detection

8 years agoFix AccountFinderConcern::AccountFinder#with_usernames (#5722)
ysksn [Thu, 16 Nov 2017 11:13:03 +0000 (20:13 +0900)]
Fix AccountFinderConcern::AccountFinder#with_usernames (#5722)

8 years agoAdd tests for Status#verb (#5717)
ysksn [Thu, 16 Nov 2017 06:46:29 +0000 (15:46 +0900)]
Add tests for Status#verb (#5717)

8 years agoAdd tests for Status#hidden? (#5719)
ysksn [Thu, 16 Nov 2017 02:07:27 +0000 (11:07 +0900)]
Add tests for Status#hidden? (#5719)

8 years ago[Nanobox] Apply Release Notes Changes (#5670)
Daniel Hunsaker [Wed, 15 Nov 2017 15:26:53 +0000 (08:26 -0700)]
[Nanobox] Apply Release Notes Changes (#5670)

Apparently I missed some things in earlier commits/releases that needed to be applied to the Nanobox setup. All minor things, nothing that breaks anything, but still best to get them in place.

- Move cron jobs to their own component, so the Sidekiq component can be scaled up to multiple instances without causing issues with running the same cron job multiple times at once.
- Update cron jobs to the latest requirements, removing extraneous ones
- Add new variables to `.env.nanobox`
- Update Nginx to use correct cache header directives

8 years agoDelegate some methods of User to @settings (#5706)
ysksn [Wed, 15 Nov 2017 15:05:20 +0000 (00:05 +0900)]
Delegate some methods of User to @settings (#5706)

* Move some tests of User into Settings::ScopedSettings

* Add a test for User@settings

8 years agoAdd a test for Tag#to_param (#5705)
ysksn [Wed, 15 Nov 2017 15:04:41 +0000 (00:04 +0900)]
Add a test for Tag#to_param (#5705)

8 years agoreusable-streaming (#5709)
masarakki [Wed, 15 Nov 2017 15:04:15 +0000 (00:04 +0900)]
reusable-streaming (#5709)

8 years agoAdd Japanese translation for DM block option. (#5704)
mayaeh [Wed, 15 Nov 2017 02:57:09 +0000 (11:57 +0900)]
Add Japanese translation for DM block option. (#5704)

8 years agoOptional notification muting (#5087)
Surinna Curtis [Wed, 15 Nov 2017 02:56:41 +0000 (20:56 -0600)]
Optional notification muting (#5087)

* Add a hide_notifications column to mutes

* Add muting_notifications? and a notifications argument to mute!

* block notifications in notify_service from hard muted accounts

* Add specs for how mute! interacts with muting_notifications?

* specs testing that hide_notifications in mutes actually hides notifications

* Add support for muting notifications in MuteService

* API support for muting notifications (and specs)

* Less gross passing of notifications flag

* Break out a separate mute modal with a hide-notifications checkbox.

* Convert profile header mute to use mute modal

* Satisfy eslint.

* specs for MuteService notifications params

* add trailing newlines to files for Pork :)

* Put the label for the hide notifications checkbox in a label element.

* Add a /api/v1/mutes/details route that just returns the array of mutes.

* Define a serializer for /api/v1/mutes/details

* Add more specs for the /api/v1/mutes/details endpoint

* Expose whether a mute hides notifications in the api/v1/relationships endpoint

* Show whether muted users' notifications are muted in account lists

* Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint

* make the hide/unhide notifications buttons work

* satisfy eslint

* In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal.

* fix a missing import

* add an explanatory comment to AccountInteractions

* Refactor handling of default params for muting to make code cleaner

* minor code style fixes oops

* Fixed a typo that was breaking the account mute API endpoint

* Apply white-space: nowrap to account relationships icons

* Fix code style issues

* Remove superfluous blank line

* Rename /api/v1/mutes/details -> /api/v2/mutes

* Don't serialize "account" in MuteSerializer

Doing so is somewhat unnecessary since it's always the current user's account.

* Fix wrong variable name in api/v2/mutes

* Use Toggle in place of checkbox in the mute modal.

* Make the Toggle in the mute modal look better

* Code style changes in specs and removed an extra space

* Code review suggestions from akihikodaki

Also fixed a syntax error in tests for AccountInteractions.

* Make AddHideNotificationsToMute Concurrent

It's not clear how much this will benefit instances in practice, as the
number of mutes tends to be pretty small, but this should prevent any
blocking migrations nonetheless.

* Fix up migration things

* Remove /api/v2/mutes

8 years agoAdd tests for StreamEntry (#5687)
ysksn [Wed, 15 Nov 2017 01:00:58 +0000 (10:00 +0900)]
Add tests for StreamEntry (#5687)

* Add tests for StreamEntry

- `#object_type`
- `#verb`
- `#mentions`

* Fix to test results instead of implementations

8 years agoFilter searched toots to be consistent with blocking behaviors (#5383)
ThibG [Wed, 15 Nov 2017 00:53:33 +0000 (01:53 +0100)]
Filter searched toots to be consistent with blocking behaviors (#5383)

8 years agoUse already-known remote user data if resolving temporarily fails in mentions (#5702)
ThibG [Wed, 15 Nov 2017 00:06:49 +0000 (01:06 +0100)]
Use already-known remote user data if resolving temporarily fails in mentions (#5702)

8 years agoAllow specifying STATSD_NAMESPACE (#5700)
Eugen Rochko [Tue, 14 Nov 2017 22:22:43 +0000 (23:22 +0100)]
Allow specifying STATSD_NAMESPACE (#5700)

8 years agoAdd option to block direct messages from people you don't follow (#5669)
Eugen Rochko [Tue, 14 Nov 2017 20:12:57 +0000 (21:12 +0100)]
Add option to block direct messages from people you don't follow (#5669)

* Add option to block direct messages from people you don't follow

Fix #5326

* If the DM responds to a toot by recipient, allow it through

* i18n: Update Polish translation (for #5669) (#5673)

8 years agoUpdating Chinese (Simplified) translations (#5643)
SerCom_KC [Tue, 14 Nov 2017 19:44:42 +0000 (03:44 +0800)]
Updating Chinese (Simplified) translations (#5643)

* i18n: (zh-CN) Bug fix for note-counter.

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Add missing translations

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Add support.array key for better wording

* Revert "i18n: (zh-CN) Add support.array key for better wording"

This reverts commit 27bf9a946e886213e827cd985d4f62419db57534.
Looks like this commit can't get pass the checks, revert it for now.

* i18n: (zh-CN) Change `客户端` to `应用`

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Add missing translations (#5635)

* i18n: (zh-CN) Change `两步验证` to `双重认证`

* i18n: (zh-CN) Improve translations

8 years agoAdd a test for SiteUpload#cache_key (#5685)
ysksn [Tue, 14 Nov 2017 19:44:11 +0000 (04:44 +0900)]
Add a test for SiteUpload#cache_key (#5685)

8 years agoRefactor remote_follow_spec.rb (#5690)
Yamagishi Kazutoshi [Tue, 14 Nov 2017 19:41:17 +0000 (04:41 +0900)]
Refactor remote_follow_spec.rb (#5690)

8 years agoAdd uniqueness to block email domains (#5692)
Yamagishi Kazutoshi [Tue, 14 Nov 2017 19:37:17 +0000 (04:37 +0900)]
Add uniqueness to block email domains (#5692)

8 years agoi18n: Update Polish translation (#5699)
Marcin Mikołajczak [Tue, 14 Nov 2017 19:36:11 +0000 (20:36 +0100)]
i18n: Update Polish translation (#5699)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoAdd Japanese translations for moderator roles and its own admin actions. (#5689)
mayaeh [Tue, 14 Nov 2017 06:53:14 +0000 (15:53 +0900)]
Add Japanese translations for moderator roles and its own admin actions. (#5689)

8 years agoi18n: fix typo in Polish translation (#5688)
Marcin Mikołajczak [Tue, 14 Nov 2017 06:52:32 +0000 (07:52 +0100)]
i18n: fix typo in Polish translation (#5688)

8 years agoAdd tests for Setting (#5683)
ysksn [Tue, 14 Nov 2017 02:08:04 +0000 (11:08 +0900)]
Add tests for Setting (#5683)

8 years agol10n: PT-BR translation updated (#5681)
Anna e só [Tue, 14 Nov 2017 02:07:38 +0000 (00:07 -0200)]
l10n: PT-BR translation updated (#5681)

* Improved e-mail messages; delted repeated words

* pt-BR.json translations updated

* Revert "pt-BR.json translations updated"

This reverts commit 108c460531196fed6e6d14f93e8d8d047c835ffd.

* Updated pt-BR.json

* pt-BR.yml updated

8 years agoAdd code of conduct from GitHub generator (#5674)
Eugen Rochko [Mon, 13 Nov 2017 16:28:55 +0000 (17:28 +0100)]
Add code of conduct from GitHub generator (#5674)

8 years agofix Code Climate badge on README.md (#5671)
takayamaki [Mon, 13 Nov 2017 02:49:54 +0000 (11:49 +0900)]
fix Code Climate badge on README.md (#5671)

and change badge's URI to https

8 years agoAdd tests for SessionActivation (#5668)
ysksn [Mon, 13 Nov 2017 00:54:48 +0000 (09:54 +0900)]
Add tests for SessionActivation (#5668)

* Fabricate SessionActivation

not only user_id but user association.

* Add tests for SessionActivation

8 years agoUpdate model annotations to use BIGINT for IDs (#5461)
Daniel Hunsaker [Sun, 12 Nov 2017 15:18:50 +0000 (08:18 -0700)]
Update model annotations to use BIGINT for IDs (#5461)

All the migrations have been updated to use BIGINTs for ID fields in the DB, but ActiveRecord needs to be told to treat those values as BIGINT as well. This PR does that.

8 years agoFix #5652 - Notify too short when abbrev in JA (#5664)
KEINOS [Sun, 12 Nov 2017 07:51:47 +0000 (16:51 +0900)]
Fix #5652 - Notify too short when abbrev in JA (#5664)

* Fix #5652 - Notify too short when abbrev in JA

Fix #5652 of the notification message to be understandable when abbreviated.

* Changed quotes as original

Double quote to single and single quote as none. But I am not convinced of this fix.

* Added a single quote as YAMLlint's suggestion

* `bundle exec i18n-tasks normalize`

8 years agoAdd tests for RemoteProfile (#5665)
ysksn [Sun, 12 Nov 2017 07:23:31 +0000 (16:23 +0900)]
Add tests for RemoteProfile (#5665)

8 years agoFix #5632 - Reset column loading status after fetch fail (#5659)
Eugen Rochko [Sun, 12 Nov 2017 03:51:07 +0000 (04:51 +0100)]
Fix #5632 - Reset column loading status after fetch fail (#5659)

8 years agoi18n: Update Polish translation (for #5635) (#5661)
Marcin Mikołajczak [Sat, 11 Nov 2017 21:31:20 +0000 (22:31 +0100)]
i18n: Update Polish translation (for #5635) (#5661)

* i18n: Update Polish translation (for #5635)

* 😑🔫

8 years agoAdd moderator role and add pundit policies for admin actions (#5635)
Eugen Rochko [Sat, 11 Nov 2017 19:23:33 +0000 (20:23 +0100)]
Add moderator role and add pundit policies for admin actions (#5635)

* Add moderator role and add pundit policies for admin actions

* Add rake task for turning user into mod and revoking it again

* Fix handling of unauthorized exception

* Deliver new report e-mails to staff, not just admins

* Add promote/demote to admin UI, hide some actions conditionally

* Fix unused i18n

8 years agoRetry thread resolving (#5599)
ThibG [Sat, 11 Nov 2017 15:49:04 +0000 (16:49 +0100)]
Retry thread resolving (#5599)

Thread resolving is one of the few tasks that isn't retried on failure.
One common cause for failure of this task is a well-connected user replying to
a toot from a little-connected user on a small instance: the small instance
will get many requests at once, and will often fail to answer requests within
the 10 seconds timeout used by Mastodon.

This changes makes the ThreadResolveWorker retry a few times, with a
rapidly-increasing time before retries and large random contribution in order
to spread the load over time.

8 years agoAdd tests for RemoteFollow (#5651)
ysksn [Fri, 10 Nov 2017 15:56:02 +0000 (00:56 +0900)]
Add tests for RemoteFollow (#5651)

* Add tests for RemoteFollow.initialize

* Add tests for RemoteFollow#valid?

* Add tests for RemoteFollow#subscribe_address_for

8 years agoUpdate en.yml (#5648)
Matt [Fri, 10 Nov 2017 01:58:33 +0000 (14:58 +1300)]
Update en.yml (#5648)

Changed "Toots with replies" to read "Toots and replies"

8 years agoFix focused background color of direct toots (#5642)
Lynx Kotoura [Thu, 9 Nov 2017 18:40:34 +0000 (03:40 +0900)]
Fix focused background color of direct toots (#5642)

8 years agoAdd tests for Notification (#5640)
ysksn [Thu, 9 Nov 2017 13:37:10 +0000 (22:37 +0900)]
Add tests for Notification (#5640)

* Add tests for Notification#target_status

* Add tests for Notification#browserable?

* Add tests for Notification.reload_stale_associations!

8 years agoAdd and Remove tests for FollowRequest (#5622)
ysksn [Thu, 9 Nov 2017 13:36:52 +0000 (22:36 +0900)]
Add and Remove tests for FollowRequest (#5622)

* Add a test for FollowRequest#authorize!

* Remove tests

There is no need to test
ActiveModel::Validations::ClassMethods#validates.

* Make an alias of destroy! as reject!

Instead of defining the method,
make an alias of destroy! as reject! because of reducing test.

8 years agoRewrite account_controller_spec (#5633)
Nanamachi [Thu, 9 Nov 2017 13:36:17 +0000 (22:36 +0900)]
Rewrite account_controller_spec (#5633)

* make accounts_controller_spec DRY

* Add blocked user spec

8 years agoShow confirmation dialog on leaving WebUI while composing (#5616)
unarist [Thu, 9 Nov 2017 13:34:41 +0000 (22:34 +0900)]
Show confirmation dialog on leaving WebUI while composing (#5616)

* Show confirmation dialog on leaving WebUI while composing

Currently, Back button and Back hotkey can cause leaving from WebUI, as well as browser's back button. Users may hit those buttons accidentally, and their composing text will be lost.

So this prevents it by showing confirmation dialog from `onbeforeunload` event.

* Fix message and comments

8 years agoi18n: Update Polish translation (#5639)
Marcin Mikołajczak [Thu, 9 Nov 2017 13:23:06 +0000 (14:23 +0100)]
i18n: Update Polish translation (#5639)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoTranslate ja (#5637)
nullkal [Thu, 9 Nov 2017 13:22:55 +0000 (22:22 +0900)]
Translate ja (#5637)

8 years agoi10n OC: Memorial (#5615) + #5467 (#5623)
Quenty31 [Wed, 8 Nov 2017 14:19:49 +0000 (15:19 +0100)]
i10n OC: Memorial (#5615) + #5467 (#5623)

* Changed ĩ => ï

* Changed ĩ => ï

* Add ability to disable login and mark accounts as memorial (#5615)

8 years agoIn remove_remote, exclude removed media attachments. (#5626)
Naoki Kosaka [Wed, 8 Nov 2017 14:19:22 +0000 (23:19 +0900)]
In remove_remote, exclude removed media attachments. (#5626)

8 years agoAdd tests for MediaAttachment (#5620)
ysksn [Wed, 8 Nov 2017 06:29:07 +0000 (15:29 +0900)]
Add tests for MediaAttachment (#5620)

- `#local?`
- `#needs_redownload?`
- `#to_param`

8 years agoAdd tests for CustomEmoji#local? and #object_type (#5621)
ysksn [Wed, 8 Nov 2017 06:28:17 +0000 (15:28 +0900)]
Add tests for CustomEmoji#local? and #object_type (#5621)

8 years agoFix process mentions for local users, as local users are considered to use OStatus...
ThibG [Tue, 7 Nov 2017 21:15:15 +0000 (22:15 +0100)]
Fix process mentions for local users, as local users are considered to use OStatus (#5618)

8 years agoEliminate space around emoji (#5474)
nullkal [Tue, 7 Nov 2017 18:09:53 +0000 (03:09 +0900)]
Eliminate space around emoji (#5474)

* Eliminate space around emoji

* More improve emoji style

* Make more compatible with Twemoji

* Make scss-lint happy

* Make not modify normal emoji's behavior

* Decrease status__action-bar's margin-top to 5px

* Make the test be passed

* Revert "Make the test be passed"

This reverts commit 54a8c60e5907ef20a5ceb5ab2c86a933e06f3ece.

* Revert "Make not modify normal emoji's behavior"

This reverts commit 6a5bdf0c11df16ebd190cb3ab9d2e8f1349f435a.

8 years agoTwidere mention workaround (#5552)
ThibG [Tue, 7 Nov 2017 18:08:14 +0000 (19:08 +0100)]
Twidere mention workaround (#5552)

* Work around Twidere and Tootdon bug

Tootdon and Twidere construct @user@domain handles from mentions in toots based
solely on the mention text and account URI's domain without performing any
webfinger call or retrieving account info from the Mastodon server.

As a result, when a remote user has WEB_DOMAIN ≠ LOCAL_DOMAIN, Twidere and
Tootdon will construct the mention as @user@WEB_DOMAIN. Now, this will usually
resolve to the correct account (since the recommended configuration is to have
WEB_DOMAIN perform webfinger redirections to LOCAL_DOMAIN) when processing
mentions, but won't do so when displaying them (as it does not go through the
whole account resolution at that time).

This change rewrites mentions to the resolved account, so that displaying the
mentions will work.

* Use lookbehind instead of non-capturing group in MENTION_RE

Indeed, substitutions with the previous regexp would erroneously eat any
preceding whitespace, which would lead to concatenated mentions in the
previous commit.

Note that users will “lose” up to one character space per mention for their
toots, as that regexp is also used to remove the domain-part of mentioned
users for character counting purposes, and it also erroneously removed the
preceding character if it was a space.

8 years agoAdd ability to disable login and mark accounts as memorial (#5615)
Eugen Rochko [Tue, 7 Nov 2017 18:06:44 +0000 (19:06 +0100)]
Add ability to disable login and mark accounts as memorial (#5615)

Fix #5597

8 years agoFix spell miss (SWIIFT_OBJECT_URL -> SWIFT_OBJECT_URL) (#5617)
MitarashiDango [Tue, 7 Nov 2017 18:06:30 +0000 (03:06 +0900)]
Fix spell miss (SWIIFT_OBJECT_URL -> SWIFT_OBJECT_URL) (#5617)

8 years agofix: slang to adequate word (#5453)
voidSatisfaction [Tue, 7 Nov 2017 13:49:50 +0000 (22:49 +0900)]
fix: slang to adequate word (#5453)

8 years ago Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)
nullkal [Tue, 7 Nov 2017 13:49:32 +0000 (22:49 +0900)]
 Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)

* Show the local couterpart of emoji when it exists in admin/custom_emojis

* Fix indentation

* Fix error

* Add class table-action-link to Overwrite link

* Make it enable to overwrite emojis

* Make Code Climate happy

8 years agoAvoid emojifying on invisible text (#5558)
MIYAGI Hikaru [Tue, 7 Nov 2017 13:48:13 +0000 (22:48 +0900)]
Avoid emojifying on invisible text (#5558)

8 years agoDo not process undeliverable mentions (#5598)
ThibG [Tue, 7 Nov 2017 13:47:39 +0000 (14:47 +0100)]
Do not process undeliverable mentions (#5598)

* Resolve remote accounts when mentioned even if they are already known

This commit reduces the risk of not having up-to-date public key or protocol
information for a remote account, which is required to deliver toots
(especially direct messages).

* Do not add mentions in private messages for remote users we cannot deliver to

Mastodon does not deliver private and direct toots to OStatus users, as there
is no guarantee the remote software understands the toot's privacy. However,
users currently do not get any feedback on it (Mastodon won't attempt delivery,
but the toot will be displayed exactly the same way to the user).

This change introduces *some* feedback by not processing mentions that are
not going to be delivered. A long-term solution is still needed to have
delivery receipts or at least some better indication of what is going on, but
at least an user can see *something* is up.

8 years agoResolve remote accounts when mentioned even if they are already known (#5539)
ThibG [Tue, 7 Nov 2017 13:31:57 +0000 (14:31 +0100)]
Resolve remote accounts when mentioned even if they are already known (#5539)

This commit reduces the risk of not having up-to-date public key or protocol
information for a remote account, which is required to deliver toots
(especially direct messages).

8 years agoUnify file upload to using fog (#5604)
Yamagishi Kazutoshi [Tue, 7 Nov 2017 13:30:31 +0000 (22:30 +0900)]
Unify file upload to using fog (#5604)

8 years agoMake fullscreen video in detailed status plays in fullscreen (Partly Fix #5160) ...
nullkal [Tue, 7 Nov 2017 13:24:55 +0000 (22:24 +0900)]
Make fullscreen video in detailed status plays in fullscreen (Partly Fix #5160) (#5611)

* Make fullscreen video in detailed status plays in fullscreen (Fix #5160)

* Directly assign the initial state

8 years agoHide disabled custom emojis from emoji picker and emoji auto suggestions. (#5613)
kedama [Tue, 7 Nov 2017 13:24:21 +0000 (22:24 +0900)]
Hide disabled custom emojis from emoji picker and emoji auto suggestions. (#5613)

Make the same behavior as /api/v1/custom_emojis.

8 years agoImplement tests for Account#refresh! (#5601)
ysksn [Mon, 6 Nov 2017 04:54:41 +0000 (13:54 +0900)]
Implement tests for Account#refresh! (#5601)

8 years agoAdd test for Account#save_with_optional_media! (#5603)
ysksn [Mon, 6 Nov 2017 04:54:12 +0000 (13:54 +0900)]
Add test for Account#save_with_optional_media! (#5603)

There was a test when some of the properties are invalid, but none when all
of them are valid.

8 years agoi18n: Improve Polish translation (#5596)
Marcin Mikołajczak [Sun, 5 Nov 2017 22:06:54 +0000 (23:06 +0100)]
i18n: Improve Polish translation (#5596)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoUpdate extract-text-webpack-plugin to version 3.0.2 (#5584)
Yamagishi Kazutoshi [Sun, 5 Nov 2017 12:07:59 +0000 (21:07 +0900)]
Update extract-text-webpack-plugin to version 3.0.2 (#5584)