262 Commits (d8fbd74c47de3148d6693b5cb15e7e868f72448e)

Author	SHA1	Message	Date
Thibaut Girka	53b7bb9d04	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml	7 years ago
Jakub Mendyk	f3a12ddfd0	Make Api::V1::MutesController paginate properly (#8472) ... Fixes #8463	7 years ago
Quint Guvernator	da13fa5021	Fix low-hanging rubocop gripes (#8458) ... * rubocop: quit being so picky * rubocop: miscellany * rubocop: prefer present to blank	7 years ago
Thibaut Girka	8b4abaa90d	Merge branch 'master' into glitch-soc/master ... Conflicts: config/routes.rb Added the “endorsements” route from upstream.	7 years ago
ThibG	b34d6238cb	Add API endpoint to list featured accounts (fixes #8315) (#8317)	7 years ago
abcang	9e75aa30cd	Unuse ActiveRecord::Base#cache_key (#8185) ... * Unuse ActiveRecord::Base#cache_key * Enable cache_versioning * Call cache_collection	7 years ago
Thibaut Girka	e5a603206d	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.	7 years ago
Thibaut Girka	90b492143d	Introduce OAuth scopes for bookmarks	7 years ago
Eugen Rochko	f2404de871	Public profile endorsements (accounts picked by profile owner) (#8146)	7 years ago
Thibaut Girka	d392020da6	Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.	7 years ago
ThibG	1ca4e51eb3	Add option to not consider word boundaries when processing keyword filtering (#7975) ... * Add option to not consider word boundaries when filtering phrases * Add a few tests for keyword/phrase filtering	7 years ago
Eugen Rochko	6b9e03e002	Add API method to remove a suggestion (#7978) ... DELETE /api/v1/suggestions/:account_id When blocking, remove suggestion from both sides. Muting not affected, since muting is supposed to be invisible to the target.	7 years ago
Eugen Rochko	9804ec3a6d	Fix missing irreversible in filters API, expires_in param (#7976)	7 years ago
Eugen Rochko	1f6ed4f86a	Add more granular OAuth scopes (#7929) ... * Add more granular OAuth scopes * Add human-readable descriptions of the new scopes * Ensure new scopes look good on the app UI * Add tests * Group scopes in screen and color-code dangerous ones * Fix wrong extra scope	7 years ago
Eugen Rochko	da8fe8079e	Re-add follow recommendations API (#7918) ... * Re-add follow recommendations API GET /api/v1/suggestions Removed in 8efa081f21 due to Neo4J dependency. The algorithm uses triadic closures, takes into account suspensions, blocks, mutes, domain blocks, excludes locked and moved accounts, and prefers more recently updated accounts. * Track interactions with people you don't follow Replying to, favouriting and reblogging someone you're not following will make them show up in follow recommendations. The interactions have different weights: - Replying is 1 - Favouriting is 10 (decidedly positive interaction, but private) - Reblogging is 20 Following them, muting or blocking will remove them from the list, obviously. * Remove triadic closures, ensure potential friendships are trimmed	7 years ago
Eugen Rochko	cdb101340a	Keyword/phrase filtering (#7905) ... * Add keyword filtering GET|POST /api/v1/filters GET|PUT|DELETE /api/v1/filters/:id - Irreversible filters can drop toots from home or notifications - Other filters can hide toots through the client app - Filters use a phrase valid in particular contexts, expiration * Make sure expired filters don't get applied client-side * Add missing API methods * Remove "regex filter" from column settings * Add tests * Add test for FeedManager * Add CustomFilter test * Add UI for managing filters * Add streaming API event to allow syncing filters * Fix tests	7 years ago
Thibaut Girka	ab5f450700	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields	7 years ago
Eugen Rochko	a58ec29631	Allow selecting default posting language instead of auto-detect (#7828) ... * Allow selecting default posting language instead of auto-detect * Enable default language setting in credentials API * Fix form saving	7 years ago
Jenkins	4d8d1fa129	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	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	7 years ago
David Yip	c55263027a	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
Eugen Rochko	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	7 years ago
Thibaut Girka	c087738270	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
tateisu	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	7 years ago
Eugen Rochko	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	7 years ago
Thibaut Girka	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.	7 years ago
Eugen Rochko	05f8c375a2	Remove small pagination limit from context API (#7564) ... Fix #7557	7 years ago
David Yip	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	7 years ago
Eugen Rochko	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	7 years ago
Thibaut Girka	78ac246b87	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Gemfile Solved conflicts by using upstream's line for posix-spawn	7 years ago
Akihiko Odaki	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.	7 years ago
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	7 years ago
Eugen Rochko	416f644505	Fix 404 for GET /api/v1/push/subscription (#7472) ... My bad...	7 years ago
Eugen Rochko	97e43ec5f0	Add GET /api/v1/push/subscription REST API (#7471) ... * Add Api::V1::Push::SubscriptionsController#show * Add to routes	7 years ago
Thibaut Girka	45fce0e496	Merge branch 'master' into glitch-soc/merge ... Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml	7 years ago
Eugen Rochko	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)	7 years ago
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	7 years ago
Eugen Rochko	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	7 years ago
abcang	db012b57c2	Fix distribute_add_activity and distribute_remove_activity (#7393)	7 years ago
David Yip	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	7 years ago
Eugen Rochko	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	7 years ago
Eugen Rochko	54f34d3f2a	Return HTTP 410 for suspended accounts in GET /api/v1/accounts/:id (#7287) ... Fix #7243	7 years ago
Akihiko Odaki	1258efa882	Paginate descendant statuses in public page (#7148)	7 years ago
Kaito Sinclaire	156b916caf	Direct messages column (#4514) ... * Added a timeline for Direct statuses * Lists all Direct statuses you've sent and received * Displayed in Getting Started * Streaming server support for direct TL * Changes to match other timelines in 2.0	7 years ago
David Yip	b7804028c2	Merge pull request #419 from ThibG/glitch-soc/features/bookmarks ... Bookmarks	7 years ago
David Yip	a817f084ea	Merge remote-tracking branch 'tootsuite/master' ... Conflicts: app/controllers/statuses_controller.rb	7 years ago
Thibaut Girka	50eb8f1f61	Add backend support for bookmarks ... Bookmarks behave like favourites, except they aren't shared with other users and do not have an associated counter.	7 years ago
Akihiko Odaki	519119f657	Paginate ancestor statuses in public page (#7102) ... This also limits the statuses returned by API, but pagination is not implemented in Web API yet. I still expect it brings user experience better than making a user wait to fetch all ancestor statuses and flooding the column with them.	7 years ago
David Yip	67e77f230e	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.	7 years ago
Levi Bard	cd0eaa349c	Enable updating additional account information from user preferences via rest api (#6789) ... * Enable updating additional account information from user preferences via rest api Resolves #6553 * Pacify rubocop * Decoerce incoming settings in UserSettingsDecorator * Create user preferences hash directly from incoming credentials instead of going through ActionController::Parameters * Clean up user preferences update * Use ActiveModel::Type::Boolean instead of manually checking stringified number equivalence	7 years ago