]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Sat, 25 Nov 2017 05:17:15 +0000 (05:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoChange navigation link for moderators (#5812)
Yamagishi Kazutoshi [Sat, 25 Nov 2017 04:53:54 +0000 (13:53 +0900)]
Change navigation link for moderators (#5812)

8 years agoAdd Japanese translations (#5810)
Yamagishi Kazutoshi [Sat, 25 Nov 2017 02:39:57 +0000 (11:39 +0900)]
Add Japanese translations (#5810)

* yarn manage:translations

* Add Japanese translation for #5087

* Add Japanese translation for #5616

* Add Japanese translation for #5746

* Add Japanese translation for #5750

8 years agostatus: preserve visibility attribute when reblogging (infoleak fix) (#5789)
William Pitcock [Sat, 25 Nov 2017 00:36:08 +0000 (18:36 -0600)]
status: preserve visibility attribute when reblogging (infoleak fix) (#5789)

this should fix *all* remaining visibility-related mastodon ostatus infoleaks.
thanks to @csaurus@gnusocial.de for pointing out the infoleak.

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 agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Fri, 24 Nov 2017 01:17:20 +0000 (01:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

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 agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Thu, 23 Nov 2017 21:17:14 +0000 (21:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

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 agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Thu, 23 Nov 2017 02:17:12 +0000 (02:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

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 agoStyling fixes
kibigo! [Wed, 22 Nov 2017 03:00:07 +0000 (19:00 -0800)]
Styling fixes

8 years agoUpdate statuses on hidden toggle (Fixes #227)
kibigo! [Wed, 22 Nov 2017 02:27:34 +0000 (18:27 -0800)]
Update statuses on hidden toggle (Fixes #227)

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Tue, 21 Nov 2017 17:17:11 +0000 (17:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoi18n: Update Polish translation - front-end added (#231)
Marcin Mikołajczak [Tue, 21 Nov 2017 16:53:13 +0000 (17:53 +0100)]
i18n: Update Polish translation - front-end added (#231)

* i18n: Update Polish translation

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* i18n: Update Polish translation

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
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 code of conduct email address
beatrix [Tue, 21 Nov 2017 16:01:28 +0000 (11:01 -0500)]
update code of conduct email address

8 years agoi18n: Update Polish translation - back-end (#230)
Marcin Mikołajczak [Tue, 21 Nov 2017 15:36:22 +0000 (16:36 +0100)]
i18n: Update Polish translation - back-end (#230)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
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 agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Tue, 21 Nov 2017 05:17:12 +0000 (05:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

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 agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Sun, 19 Nov 2017 15:17:12 +0000 (15:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

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 agoUpdate .following_map examples with show-reblogs information.
David Yip [Sun, 19 Nov 2017 08:56:45 +0000 (02:56 -0600)]
Update .following_map examples with show-reblogs information.

8 years agoMerge remote-tracking branch 'tootsuite/master'
David Yip [Sun, 19 Nov 2017 07:30:29 +0000 (01:30 -0600)]
Merge remote-tracking branch 'tootsuite/master'

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 agoMerge pull request #226 from glitch-soc/glitch-theme
beatrix [Sun, 19 Nov 2017 01:32:17 +0000 (20:32 -0500)]
Merge pull request #226 from glitch-soc/glitch-theme

Glitch/Vanilla themes

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 agoEnabled vanilla thmee
kibigo! [Sat, 18 Nov 2017 19:06:04 +0000 (11:06 -0800)]
Enabled vanilla thmee

8 years agoPublic pack fix
kibigo! [Sat, 18 Nov 2017 19:05:39 +0000 (11:05 -0800)]
Public pack fix

8 years agoMedia styling
kibigo! [Sat, 18 Nov 2017 19:05:23 +0000 (11:05 -0800)]
Media styling

8 years agoFont styles are now packagified
kibigo! [Sat, 18 Nov 2017 19:05:00 +0000 (11:05 -0800)]
Font styles are now packagified

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 agoMerge pull request #208 from yipdw/keyword-mute
beatrix [Sat, 18 Nov 2017 17:06:40 +0000 (12:06 -0500)]
Merge pull request #208 from yipdw/keyword-mute

Run keyword mutes on hashtags

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Sat, 18 Nov 2017 06:17:14 +0000 (06:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

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 agoSets default theme to glitch
kibigo! [Sat, 18 Nov 2017 03:32:04 +0000 (19:32 -0800)]
Sets default theme to glitch

8 years agoRemoved glitch tests
kibigo! [Sat, 18 Nov 2017 03:25:06 +0000 (19:25 -0800)]
Removed glitch tests

8 years agoRestore vanilla components
kibigo! [Sat, 18 Nov 2017 03:16:35 +0000 (19:16 -0800)]
Restore vanilla components

8 years agoForking glitch theme
kibigo! [Sat, 18 Nov 2017 03:11:18 +0000 (19:11 -0800)]
Forking glitch theme

8 years agoMerge pull request #223 from glitch-soc/glitchsoc/feature/configurable-status-size
beatrix [Sat, 18 Nov 2017 00:02:40 +0000 (19:02 -0500)]
Merge pull request #223 from glitch-soc/glitchsoc/feature/configurable-status-size

Make character limit configurable (from tootsuite/mastodon#5697)

8 years agoMerge pull request #224 from yipdw/merge-upstream
David Yip [Fri, 17 Nov 2017 23:58:13 +0000 (17:58 -0600)]
Merge pull request #224 from yipdw/merge-upstream

Merge upstream (tootsuite/mastodon#5703)

8 years agoUpdate annotations on Follow, FollowRequest, and Mute.
David Yip [Fri, 17 Nov 2017 23:41:15 +0000 (17:41 -0600)]
Update annotations on Follow, FollowRequest, and Mute.

Follow and FollowRequest had conflicts in their schema annotations, so I
ran latest migrations and let annotate_models fix them up.

8 years agoMerge remote-tracking branch 'origin/master' into merge-upstream
David Yip [Fri, 17 Nov 2017 23:40:00 +0000 (17:40 -0600)]
Merge remote-tracking branch 'origin/master' into merge-upstream

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 agoMerge pull request #222 from yipdw/merge/tootsuite/master
David Yip [Fri, 17 Nov 2017 20:35:16 +0000 (14:35 -0600)]
Merge pull request #222 from yipdw/merge/tootsuite/master

Merge upstream (e28b33c.. 94c5a11)

8 years agoMerge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into...
David Yip [Fri, 17 Nov 2017 20:28:16 +0000 (14:28 -0600)]
Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size

8 years agoMerge pull request #221 from glitch-soc/local-only-policy
beatrix [Fri, 17 Nov 2017 20:17:49 +0000 (15:17 -0500)]
Merge pull request #221 from glitch-soc/local-only-policy

Update StatusPolicy to check current_account for local_only? toots.

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Fri, 17 Nov 2017 20:17:12 +0000 (20:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoMerge pull request #218 from glitch-soc/themed-prefetching
David Yip [Fri, 17 Nov 2017 20:01:23 +0000 (14:01 -0600)]
Merge pull request #218 from glitch-soc/themed-prefetching

Themed preloading

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 agoUpdate StatusPolicy to check current_account for local_only? toots.
David Yip [Fri, 17 Nov 2017 15:07:21 +0000 (09:07 -0600)]
Update StatusPolicy to check current_account for local_only? toots.

StatusPolicy#account was renamed to StatusPolicy#current_account in
upstream.  This commit renames the local-only changes to match and
augments the #show? policy spec with what we expect for local-only
toots.

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 agoAdd trailing comma in mapStateToProps
David Yip [Fri, 17 Nov 2017 06:24:22 +0000 (00:24 -0600)]
Add trailing comma in mapStateToProps

Consistency, eslint, etc.

8 years agoMerge pull request #219 from glitch-soc/no-spin
David Yip [Fri, 17 Nov 2017 06:14:24 +0000 (00:14 -0600)]
Merge pull request #219 from glitch-soc/no-spin

Remove 'spin' theme

8 years agoThrow layout, isWide, navbarUnder back into mapStateToProps.
David Yip [Fri, 17 Nov 2017 06:11:01 +0000 (00:11 -0600)]
Throw layout, isWide, navbarUnder back into mapStateToProps.

This gets wide view, auto layout, and navbar-under-mobile working again.

8 years agoRemoves spin theme
kibigo! [Fri, 17 Nov 2017 05:50:07 +0000 (21:50 -0800)]
Removes spin theme

8 years agoThemed prefetching
kibigo! [Fri, 17 Nov 2017 05:35:25 +0000 (21:35 -0800)]
Themed prefetching

8 years agoMerge remote-tracking branch 'origin/master' into gs-master
David Yip [Fri, 17 Nov 2017 04:52:37 +0000 (22:52 -0600)]
Merge remote-tracking branch 'origin/master' into gs-master

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 agoMerge pull request #216 from glitch-soc/merge-upstream-3023725
Surinna Curtis [Thu, 16 Nov 2017 07:38:26 +0000 (01:38 -0600)]
Merge pull request #216 from glitch-soc/merge-upstream-3023725

Merge upstream at commit 3023725

8 years agoMerge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5
Surinna Curtis [Thu, 16 Nov 2017 07:21:16 +0000 (01:21 -0600)]
Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5

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 agoMerge pull request #217 from monsterpit-daggertooth/fix-streaming-host-env
David Yip [Thu, 16 Nov 2017 05:40:07 +0000 (23:40 -0600)]
Merge pull request #217 from monsterpit-daggertooth/fix-streaming-host-env

Allow streaming server to take bindhost from HOST env

8 years agoAdd some examples for Glitch::KeywordMute::TagMatcher. #208.
David Yip [Thu, 16 Nov 2017 05:31:49 +0000 (23:31 -0600)]
Add some examples for Glitch::KeywordMute::TagMatcher.  #208.

8 years agoAllow streaming server to take bindhost from HOST env
Daggertooth [Tue, 14 Nov 2017 08:32:24 +0000 (08:32 +0000)]
Allow streaming server to take bindhost from HOST env

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 agoReplace =~ with #matches?. #208.
David Yip [Thu, 16 Nov 2017 00:26:21 +0000 (18:26 -0600)]
Replace =~ with #matches?.  #208.

=~ made sense when we were passing it through to a regex, but we're no
longer doing that: TagMatcher looks at individual tags and returns a
value that *looks* like what you get out of #=~ but really isn't that
meaningful.  Probably a good idea to not subvert convention like this
and instead use a name with guessable intent.

8 years agoPrefix cache keys with the matcher type. #208.
David Yip [Thu, 16 Nov 2017 00:08:03 +0000 (18:08 -0600)]
Prefix cache keys with the matcher type.  #208.

We already know about one regex limitation, which is that they cannot
segment words in e.g. Japanese, Chinese, or Thai.  It may also end up
that regex matching is too slow compared to other methods.

However, the regex is an implementation detail.  We still want the
ability to switch between "occurs anywhere" and "match whole word", and
caching the matcher result is likely to still be important (since the
matcher itself won't change nearly as often as status ingress rate).
Therefore, we ought to be able to change the cache keys to reflect a
change of data structure.

(Old cache keys expire within minutes, so they shouldn't be too big of
an issue.  Old cache keys could also be explicitly removed by an
instance administrator.)

8 years agoMatch keyword mute filter on hashtags. #208.
David Yip [Wed, 15 Nov 2017 23:26:29 +0000 (17:26 -0600)]
Match keyword mute filter on hashtags.  #208.

It is reasonable to expect someone to enter #foo to mute hashtag #foo.
However, tags are recorded on statuses without the preceding #.
To adjust for this, we build a separate tag matcher and use
Tag::HASHTAG_RE to extract a hashtag from the hashtag syntax.

8 years agoAlso run the keyword matcher on a status' tags. #208.
David Yip [Mon, 6 Nov 2017 22:48:36 +0000 (16:48 -0600)]
Also run the keyword matcher on a status' tags.  #208.

8 years agoMerge pull request #212 from aschmitz/feat/mute-reblogs
beatrix [Wed, 15 Nov 2017 17:01:17 +0000 (12:01 -0500)]
Merge pull request #212 from aschmitz/feat/mute-reblogs

Allow hiding reblogs on a per-follow basis

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