083f78b8fb
Stub out Glitch::ApplyKeywordMutesService. #199 .
...
This service will apply/unapply keyword mutes to home and mentions
timelines. Maybe other timelines if I find a way to make it work.
2018-06-13 03:32:30 -05:00
5cff053944
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
2018-06-12 18:13:30 -05:00
e931cf656d
Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
...
Conflicts:
app/models/glitch/keyword_mute.rb
2018-06-12 16:39:30 -05:00
4d8d1fa129
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-06-12 13:17:21 +00:00
7086aa598b
Add tests for intents_controller ( #7763 )
2018-06-09 22:47:50 +02:00
10f51c9886
Fix domain hiding logic ( #7765 )
...
* Send rejections to followers when user hides domain they're on
* Use account domain blocks for "authorized followers" action
Replace soft-blocking (block & unblock) behaviour with follow rejection
* Split sync and async work of account domain blocking
Do not create domain block when removing followers by domain, that
is probably unexpected from the user's perspective.
* Adjust confirmation message for domain block
* yarn manage:translations
2018-06-09 22:46:54 +02:00
97d2df77aa
Add apply-to-mentions option to keyword mute UI. #454 .
2018-06-04 02:51:28 -05:00
c55263027a
Merge remote-tracking branch 'origin/master' into gs-master
2018-06-03 19:44:05 -05:00
0deb9fa6b9
Remove trending hashtags ( #7711 )
...
* Delete trends_controller.rb
* Update routes.rb
* Update trending_tags.rb
* Update index.js
* Update index.js
* Update search_results.js
* Update async-components.js
* Update index.js
* Delete trends.js
* Delete trends.js
* Delete trends_container.js
* Delete trends.js
* Update search_results.js
* Update search_results_container.js
2018-06-04 02:18:18 +02:00
c087738270
Merge branch 'master' into glitch-soc/merge-upstream
2018-05-29 13:52:26 +02:00
8bb74e50be
Add GET /api/v2/search which returns rich tag objects, adjust web UI ( #7661 )
2018-05-29 02:01:24 +02:00
b87a1229c7
optimize direct timeline ( #7614 )
...
* optimize direct timeline
* fix typo in class name
* change filter condition for direct timeline
* fix codestyle issue
* revoke index_accounts_not_silenced because direct timeline does not use it.
* revoke index_accounts_not_silenced because direct timeline does not use it.
* fix rspec test condition.
* fix rspec test condition.
* fix rspec test condition.
* revoke adding column and partial index
* (direct timeline) move merging logic to model
* fix pagination parameter
* add method arguments that switches return array of status or cache_ids
* fix order by
* returns ActiveRecord.Relation in default behavor
* fix codestyle issue
2018-05-28 11:04:06 +02:00
9bd23dc4e5
Track trending tags ( #7638 )
...
* Track trending tags
- Half-life of 1 day
- Historical usage in daily buckets (last 7 days stored)
- GET /api/v1/trends
Fix #271
* Add trends to web UI
* Don't render compose form on search route, adjust search results header
* Disqualify tag from trends if it's in disallowed hashtags setting
* Count distinct accounts using tag, ignore silenced accounts
2018-05-27 21:45:30 +02:00
659b8a12ec
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/ca.yml
config/locales/nl.yml
config/locales/oc.yml
config/locales/pt-BR.yml
Resolved conflicts by removing upstream-specific changes
2018-05-27 13:20:15 +02:00
ebf2fef029
Catch ActionController::UnknownFormat and return HTTP 406 ( #7621 )
...
An error like that should not appear in production error log.
2018-05-26 01:09:30 +02:00
e0ef89c73f
Merge branch 'master' into glitch-soc/merge-upstream
2018-05-23 16:05:19 +02:00
4d81809f36
Yeah, it was supposed to be #create?
2018-05-22 20:05:24 +02:00
36e47a31e3
Enforce order on authorized applications page ( #7587 )
...
Fix #7586
2018-05-22 14:44:53 +02:00
a4c9bda771
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/javascript/styles/mastodon-light.scss
config/locales/en.yml
config/locales/fr.yml
config/locales/simple_form.pl.yml
config/themes.yml
Conflicts resolved by deleting config/themes.yml,
marking app/javascript/styles/mastodon-light.scss as added,
and taking all new translation strings, not removing anything from
them.
2018-05-21 16:40:02 +02:00
05f8c375a2
Remove small pagination limit from context API ( #7564 )
...
Fix #7557
2018-05-21 12:43:05 +02:00
b481e4fac1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/simple_form.ja.yml
2018-05-19 22:41:10 +02:00
8378b72eba
Ensure push subscription is immediately removed when application is revoked ( #7548 )
...
* Ensure push subscription is immediately removed when application is revoked
* When token is revoked from app, unsubscribe too
2018-05-19 21:05:08 +02:00
e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/controllers/settings/preferences_controller.rb
app/lib/user_settings_decorator.rb
app/models/user.rb
config/locales/simple_form.en.yml
2018-05-18 08:47:10 -05:00
1e02dc8715
Add preference to hide following/followers lists ( #7532 )
...
* Add preference to hide following/followers lists
- Public pages
- ActivityPub collections (does not return pages but does give total)
- REST API (unless it's your own) (does not federate)
Fix #6901
* Add preference
* Add delegation
* Fix issue
* Fix issue
2018-05-18 02:26:51 +02:00
2636a23092
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-17 11:17:21 +00:00
7293b9fc61
Ensure unfilled fields are shown when errors are shown ( #7523 )
...
Fix #7486
2018-05-17 13:00:56 +02:00
dfb6907e08
HTTP signatures spec no longer requires algorithms field ( #7525 )
...
Fix #7520
2018-05-17 04:03:28 +02:00
78ac246b87
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Gemfile
Solved conflicts by using upstream's line for posix-spawn
2018-05-16 21:52:38 +02:00
77cd6b5096
Do not use permitted_for scope when querying pinned statuses ( #7510 )
...
permitted_for scope is slow when combined with pinned status scope.
Fortunately permitted_for scope can safely be removed because a pinned
status is always public.
2018-05-16 12:30:14 +02:00
55fd55714a
Raise Mastodon::RaceConditionError if Redis lock failed ( #7511 )
...
An explicit error allows user agents to know the error and Sidekiq to
retry.
2018-05-16 12:29:45 +02:00
ba7ee67498
Merge branch 'master' into glitch-soc/merge
2018-05-14 20:51:50 +02:00
416f644505
Fix 404 for GET /api/v1/push/subscription ( #7472 )
...
My bad...
2018-05-13 21:45:18 +02:00
97e43ec5f0
Add GET /api/v1/push/subscription REST API ( #7471 )
...
* Add Api::V1::Push::SubscriptionsController#show
* Add to routes
2018-05-13 21:07:31 +02:00
45fce0e496
Merge branch 'master' into glitch-soc/merge
...
Conflicts:
app/controllers/invites_controller.rb
app/serializers/initial_state_serializer.rb
config/locales/ko.yml
2018-05-11 18:12:42 +02:00
352bae8c3e
Update session activation time ( fixes #5605 ) ( #7408 )
2018-05-11 13:20:58 +02:00
50491e0d92
Add tests for invites controller ( #7441 )
...
* Add tests for invites controller
* Small refactoring and fix for invites controller
2018-05-11 13:14:33 +02:00
b4fb766b23
Add REST API for Web Push Notifications subscriptions ( #7445 )
...
- POST /api/v1/push/subscription
- PUT /api/v1/push/subscription
- DELETE /api/v1/push/subscription
- New OAuth scope: "push" (required for the above methods)
2018-05-11 11:49:12 +02:00
1c9c0167b7
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
42cd363542
Bot nameplates ( #7391 )
...
* Store actor type in database
* Add bot nameplate to web UI, add setting to preferences, API, AP
Fix #7365
* Fix code style issues
2018-05-07 09:31:07 +02:00
db012b57c2
Fix distribute_add_activity and distribute_remove_activity ( #7393 )
2018-05-07 09:30:18 +02:00
bd10a7e480
Add resend confirmation for admin ( #7378 )
...
* Add confirmations_controller#resend
* Add tests for confirmations_controller#resend
* Add translations
2018-05-06 10:59:03 +02:00
c7d1a2e400
Improve admin UI for accounts ( #7360 )
...
* Improve design of account statuses admin UI (consistent with reports)
* Make account moderation notes look consistent with report notes
* i18n-tasks remove-unused
* Fix code style issues
* Fix tests
2018-05-05 23:06:29 +02:00
7600067a30
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
db/schema.rb
2018-05-04 14:16:30 -05:00
cb62935c0b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-04 18:17:32 +00:00
d1aef17f9a
Do not render first page of following and followers collections unless explicitly asked to ( #7357 )
2018-05-04 20:17:01 +02:00
2c1f7b2ece
Better pagination for ActivityPub outbox ( #7356 )
2018-05-04 19:19:11 +02:00
c816701550
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
.travis.yml
Gemfile.lock
README.md
app/controllers/settings/follower_domains_controller.rb
app/controllers/statuses_controller.rb
app/javascript/mastodon/locales/ja.json
app/lib/feed_manager.rb
app/models/media_attachment.rb
app/models/mute.rb
app/models/status.rb
app/services/mute_service.rb
app/views/home/index.html.haml
app/views/stream_entries/_simple_status.html.haml
config/locales/ca.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
config/locales/nl.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/themes.yml
2018-05-03 17:23:44 -05:00
cb5b5cb5f7
Slightly reduce RAM usage ( #7301 )
...
* No need to re-require sidekiq plugins, they are required via Gemfile
* Add derailed_benchmarks tool, no need to require TTY gems in Gemfile
* Replace ruby-oembed with FetchOEmbedService
Reduce startup by 45382 allocated objects
* Remove preloaded JSON-LD in favour of caching HTTP responses
Reduce boot RAM by about 6 MiB
* Fix tests
* Fix test suite by stubbing out JSON-LD contexts
2018-05-02 18:58:48 +02:00
cae933510c
Allow updating bio fields via PUT /api/v1/accounts/update_credentials ( #7288 )
...
Add raw bio fields to the source attribute on GET /api/v1/accounts/verify_credentials
2018-05-02 15:57:37 +02:00
f62ee1ddb0
Disable API access when login is disabled ( #7289 )
2018-04-30 09:13:14 +02:00
David Yip
Jenkins
Shuhei Kitagawa
Eugen Rochko
Thibaut Girka
tateisu
Akihiko Odaki
abcang