998 Commits (d8fbd74c47de3148d6693b5cb15e7e868f72448e)

Author	SHA1	Message	Date
Thibaut Girka	c24491a8df	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
sundevour	4bfd786550	formatter spec fixes & clarification (#8481) ... updates some "context" and "it" lines to have clearer explanations updates "context" lines to properly describe function input, and "it" lines to describe results	7 years ago
Thibaut Girka	43d132039b	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	5e1767173f	Display pending message on admin relays UI (#8494) ... * Add missing specs for relay accept/reject * Display pending message on admin relays UI	7 years ago
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	36393e1d2b	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.	7 years ago
Eugen Rochko	22e46ebad8	Add theme identifier to body classes for easier custom CSS styling (#8439) ... Add forgotten custom CSS admin setting strings	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
Eugen Rochko	2f34b747b3	Allow mods to disable login, improve message when login disabled (#8329) ... * Allow moderators to disable/enable login * Instead of rejecting login, show forbidden error when login disabled Avoid confusion because when login is rejected, the message is that the account is not activated, which is wrong. * Fix tests	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	802cf6a4c5	Improve federated ID validation (#8372) ... * Fix URI not being sufficiently validated with prefetched JSON * Add additional id validation to OStatus documents, when possible	7 years ago
masarakki	4bdab203ac	exclude-other-silenced-accounts (#7528)	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	8b4abaa90d	Merge branch 'master' into glitch-soc/master ... Conflicts: config/routes.rb Added the “endorsements” route from upstream.	7 years ago
Eugen Rochko	6226aa83d7	Increase reach of Delete->Actor activities (#8305) ... Fix #7316	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	d010816ba8	Fix error when trying to update counters for statuses that are gone (#8251)	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
Thibaut Girka	280d7b1df8	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).	7 years ago
ThibG	59f7f4c923	Implement Undo { Accept { Follow } } (fixes #8234) (#8245) ... * Add Follow#revoke_request! * Implement Undo { Accept { Follow } } (fixes #8234)	7 years ago
ThibG	af912fb308	Allow accessing local private/DM messages by URL (#8196) ... * Allow accessing local private/DM messages by URL (Provided the user pasting the URL is authorized to see the toot, obviously) * Fix SearchServiceSpec tests	7 years ago
Eugen Rochko	aaac14b8ad	Show exact number of followers/statuses on export page/in tooltip (#8199) ... * Show exact number of followers/statuses on export page/in tooltip * Fix tests	7 years ago
Eugen Rochko	8e111b753a	Move status counters to separate table, count replies (#8104) ... * Move status counters to separate table, count replies * Migration to remove old counter columns from statuses table * Fix schema file	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	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	0dcc1950d1	Update /terms and /about/more to use public layout (#8142)	7 years ago
Eugen Rochko	f2404de871	Public profile endorsements (accounts picked by profile owner) (#8146)	7 years ago
Thibaut Girka	bf1d3ae3b8	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/settings.yml	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	cc56f2230a	Add separate setting for sidebar text (site_short_description) (#8107) ... * Add separate setting for sidebar text (site_short_description) * Fix tests	7 years ago
Thibaut Girka	9f2945ef80	Add test to disallow remote users from fetching local-only toots	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
Eugen Rochko	e7e577dd6e	Enforce username format for remote users, too (#8102) ... Initially I thought there might be valid reasons for remote users to have a different, unpredicted username format. However, I now realize such a difference would be unusable and unexpected within Mastodon. Fix #8058	7 years ago
Thibaut Girka	5f1bdca4c8	Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream ... Merge upstream changes right before the public profile redesign.	7 years ago
Eugen Rochko	bb71538bb5	Redesign public profiles and toots (#8068)	7 years ago
Eugen Rochko	0fb0037ca7	Resize images by area instead of fixed dimensions (#8083) ... To improve the way super tall or super ride images are treated, the numbers remain the same, 1280x1280 and 400x400, but if an image is less in one dimension than the other, the other can become larger Thanks to @WAHa_06x36@mastodon.social for the tip	7 years ago
Thibaut Girka	f26f1145ac	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x	7 years ago
Eugen Rochko	2a176514be	Display full acct on public status pages, always (#8011)	7 years ago
Eugen Rochko	38e9662d78	Disable language detection for texts shorter than 140 characters (#8010) ... If the input text is blank after preparation (only mention, or only URL, or empty as in a media post), then use nil as language, since it's OK to show to everyone. Otherwise, always fall back to the server's default locale	7 years ago
Eugen Rochko	e55dce3176	Add federation relay support (#7998) ... * Add federation relay support * Add admin UI for managing relays * Include actor on relay-related activities * Fix i18n	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
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	cd509d2146	Remove .p-name microformat class (#7961) ... Fix #7926	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