387 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
Thibaut Girka	246c313d45	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.	7 years ago
Jakub Mendyk	6cb3514d64	Add ability to change an instance default theme from the administration panel (#7092) (#8381) ... * Add default_settings class method to ScopedSettings ScopedSettings was extended to use value of unscoped setting instead of only using defaults set in config/settings.yml for selected settings. This adds possibility for admins to set default values of users' settings, for example default theme (as requested in #7092). * Add ability to change an instance default theme Closes #7092	7 years ago
Thibaut Girka	e70fc059a9	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	2374a00c10	Add confirmation step to account suspensions (#8353) ... * Add confirmation page for suspensions * Suspension confirmation closes reports, linked from report UI * Fix tests	7 years ago
Thibaut Girka	bfeac6747a	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers.	7 years ago
Eugen Rochko	78fa926ed5	Add remote interaction dialog for toots (#8202) ... * Add remote interaction dialog for toots * Change AuthorizeFollow into AuthorizeInteraction, support statuses * Update brakeman.ignore * Adjust how interaction buttons are display on public pages * Fix tests	7 years ago
S.H	5f41bbd274	Update Rails (#8141) ... * Update Rails * fix Update Rails	7 years ago
S.H	2aeeffc3ec	Update Rails (#8141) ... * Update Rails * fix Update Rails	7 years ago
Thibaut Girka	03afc365d5	Introduce OAuth scopes for bookmarks	7 years ago
Thibaut Girka	c1c514ca70	Merge branch 'master' into glitch-soc/merge-upstream ... Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.	7 years ago
Eugen Rochko	60df87f6f0	Compensate for scrollbar disappearing when media modal visible (#8100) ... * Compensate for scrollbar disappearing when media modal visible Make auth pages backgrounds lighter * Fix typo	7 years ago
Thibaut Girka	402da8065c	Migrate glitch-soc keyword mutes to Mastodon's ... Completely remove glitch-soc's Keyword Mutes, migrate existing database records to CustomFilters. Handling of client-side filters is still not implemented in the glitch-soc front-end.	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
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	4b0f27ba78	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Shuhei Kitagawa	23955d956e	Add tests for remote_unfollows_controller (#7879)	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
Shuhei Kitagawa	459394a020	Add missing tests for confirmations controller (#7866)	7 years ago
Shuhei Kitagawa	63b05096c7	Add tests for shares_controller (#7835)	7 years ago
Eugen Rochko	7eec279c7f	Change language opt-out to language opt-in (#7823) ... * Switch filtered_languages to chosen_languages * Adjust interface * Remove unused translations	7 years ago
Jenkins	afceef74c2	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Shuhei Kitagawa	ad8814232f	Add tests for following accounts controller (#7800)	7 years ago
Shuhei Kitagawa	5b47774ab8	Add tests for followers_accounts_controller (#7794)	7 years ago
Jenkins	4d8d1fa129	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Shuhei Kitagawa	6151308c47	Add missing tests for admin/accounts_controller (#7791)	7 years ago
Shuhei Kitagawa	7086aa598b	Add tests for intents_controller (#7763)	7 years ago
David Yip	8142bd2553	Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/models/status.rb The conflict in the Status model was due to 5bf5003384. It was resolved by accepting tootsuite's changes.	7 years ago
Shuhei Kitagawa	12fa2500c4	Add missing tests for sessions controller (#7744)	7 years ago
Shuhei Kitagawa	22caa32ba2	Add tests for embeds controller (#7719) ... * Small refactoring of status_finder_spec * Add tests for embeds_controller	7 years ago
David Yip	3550470c18	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json The above conflicts appear to be a text conflict introduced by glitch-soc's additional level of columns (i.e. moving a bunch of columns under the Misc option). They were resolved via accept-ours.	7 years ago
Shuhei Kitagawa	00512ecf87	Add tests for migrations_controller (#7707)	7 years ago
Thibaut Girka	c087738270	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Shuhei Kitagawa	b0b34a5e38	Add a test for emojis_controller (#7652)	7 years ago
Thibaut Girka	e0ef89c73f	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Yamagishi Kazutoshi	6d99a0b652	Fix tests for invites controller (regression from 4d81809f36) (#7597)	7 years ago
Shuhei Kitagawa	12e590edd7	Add tests for report notes controller (#7589)	7 years ago
Thibaut Girka	b481e4fac1	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/simple_form.ja.yml	7 years ago
Eugen Rochko	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	7 years ago
Jenkins	2636a23092	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Shuhei Kitagawa	b48a166c82	Add tests for account_moderation_notes_controller (#7524)	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
Shuhei Kitagawa	50491e0d92	Add tests for invites controller (#7441) ... * Add tests for invites controller * Small refactoring and fix for invites controller	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
Shuhei Kitagawa	ce35d81db7	Add tests for admin/roles_controller (#7421)	7 years ago
Shuhei Kitagawa	35eff337d5	Add tests for admin/invites_controller (#7412)	7 years ago