557 Commits (befe8c72ddd3b427ccf1489a6de6bcc23b6a55f5)

Author	SHA1	Message	Date
Thibaut Girka	12c8ac9e14	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.	5 years ago
Eugen Rochko	72a7cfaa39	Add e-mail-based sign in challenge for users with disabled 2FA (#14013)	5 years ago
ThibG	aed3a436a2	Fix serialization of replies when some of them are URIs (#13957) ... * Fix serialization of replies when some of them are URIs Fixes #13956 * Add test	5 years ago
Thibaut Girka	27b5143dc4	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
ThibG	71fce71c94	Fix webfinger returning wrong status code on malformed or missing param (#13759) ... Fixes #13757	5 years ago
Thibaut Girka	3baacf6993	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
dependabot-preview[bot]	78202e9138	Bump doorkeeper from 5.3.3 to 5.4.0 (#13733) ... * Bump doorkeeper from 5.3.3 to 5.4.0 Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.3.3 to 5.4.0. - [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases) - [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md) - [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.3.3...v5.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Fix tests * Fix use of Doorkeeper::AccessToken.find_or_create_for * Fix tests? Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	4bcef12bad	Fix sr locale being selected over sr-Latn (#13693) ... * Fix sr locale being selected over sr-Latn * Update tests	5 years ago
Thibaut Girka	4a70792b4a	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.	5 years ago
Eugen Rochko	4b766f9846	Refactor monkey-patching of Goldfinger (#12561)	5 years ago
Eugen Rochko	8be4c2ba21	Add ability to remove identity proofs from account (#13682) ... Fix #12613	5 years ago
ThibG	f1e0fa80f6	Fix own following/followers not showing muted users (#13614) ... Fixes #13612	5 years ago
Eugen Rochko	5cff7910c2	Add more ActivityPub controller tests (#13590)	5 years ago
Thibaut Girka	a22e6a3683	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Upstream disabled the embed controller for reblogs. Not a real conflict, but glitch-soc has an extra line to deal with its theming system. Ported upstream changes. - `app/javascript/packs/public.js`: Upstream made changes to get rid of most inline CSS, this changes javascript for public pages, which in glitch are split between different files. Ported those changes. - `app/models/status.rb`: Upstream changed the block check in `Status#permitted_for` to include domain-block checks. Not a real conflict with glitch-soc, but our scope is slightly different, as our scope for unauthenticated access do not include instance-local toots. Ported upstream changes. - `app/serializers/rest/instance_serializer.rb`: Not a real conflict, upstream added a new field to the instance serializer, the conflict is one line above since we added more of that. Ported upstream changes. - `app/views/settings/profiles/show.html.haml`: Upstream got rid of most inline CSS and moved hidden elements to data attributes in the process, in fields were we have different values. Ported upstream changes while keeping our glitch-specific values. - `app/views/statuses/_simple_status.html.haml`: Upstream got rid of inline CSS on an HAML line we treat differently, stripping empty text nodes. Ported upstream changes to the style attribute, keeping the empty text node stripping behavior.	5 years ago
Eugen Rochko	988b0493fe	Add more tests for ActivityPub controllers (#13585)	5 years ago
Thibaut Girka	9abb227250	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.	5 years ago
ThibG	61f35c1a8a	Fix reported accounts not being whitelisted when resolving a spamcheck report (#13289)	5 years ago
Thibaut Girka	c790ecb14d	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.	5 years ago
Eugen Rochko	339ce1c4e9	Add specific rate limits for posting and following (#13172)	5 years ago
Thibaut Girka	51d326f852	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Eugen Rochko	0c28a505dd	Fix leak of arbitrary statuses through unfavourite action in REST API (#13161)	5 years ago
Thibaut Girka	e037002401	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
ThibG	c48d895ea7	Fix sign-ups without checked user agreement being accepted through the web form (#13088) ... * Fix user agreement not being verified * Fix tests * Fix up agreement field being dismissed	5 years ago
Thibaut Girka	0cbd6d696b	Add test for health_check endpoint	5 years ago
Thibaut Girka	1a54b9b99e	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Eugen Rochko	5265df0a8a	Change signature verification to ignore signatures with invalid host (#13033) ... Instead of returning a signature verification error, pretend there was no signature (i.e., this does not allow access to resources that need a valid signature), so public resources can still be fetched Fix #13011	5 years ago
Thibaut Girka	9adeaf2bfc	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system	5 years ago
Eugen Rochko	f52c988e12	Add announcements (#12662) ... * Add announcements Fix #11006 * Add reactions to announcements * Add admin UI for announcements * Add unit tests * Fix issues - Add `with_dismissed` param to announcements API - Fix end date not being formatted when time range is given - Fix announcement delete causing reactions to send streaming updates - Fix announcements container growing too wide and mascot too small - Fix `all_day` being settable when no time range is given - Change text "Update" to "Announcement" * Fix scheduler unpublishing announcements before they are due * Fix filter params not being passed to announcements filter	5 years ago
Thibaut Girka	01eaeab56d	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.	5 years ago
Eugen Rochko	49b2f7c0a2	Fix base64-encoded file uploads not being possible (#12748) ... Fix #3804, Fix #5776	5 years ago
ThibG	3b3bdc7293	Hide blocked users from more places (#12733) ... * Hide blocked, muted, and blocked-by users from toot favourite lists * Hide blocked, muted, and blocked-by users from toot reblog lists * Hide blocked, muted, and blocked-by users from followers/following (API) * Fix tests * Hide blocked, muted, and blocked-by users from followers/following on public pages	5 years ago
Thibaut Girka	ab5ff638f2	Merge branch 'master' into glitch-soc/master ... Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc	5 years ago
ThibG	da2143b308	Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436) ... * Revert "Fix ignoring whole status because of one invalid hashtag (#11621)" This reverts commit dff46b260b. * Fix statuses being rejected because of invalid hashtag names * Add spec for invalid hashtag names in statuses * Add test for featured tags controller	5 years ago
Thibaut Girka	ff67385cfb	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code	6 years ago
Gomasy	5a2c0707f1	Support min_id-based pagination for bookmarks (#12381) ... * Support min_id-based pagination for bookmarks * Fix spec	6 years ago
Jennifer Glauche	fd93a9c871	make it not return http 400 when passing and empty source argument (#12259) ... * make it not return http 400 when passing and empty source argument * create a spec for the empty source hash bug * compact checks for nil, empty? parameters * use nil.blank? instead checking for nil	6 years ago
ThibG	dfea7368c9	Add bookmarks (#7107) ... * Add backend support for bookmarks Bookmarks behave like favourites, except they aren't shared with other users and do not have an associated counter. * Add spec for bookmark endpoints * Add front-end support for bookmarks * Introduce OAuth scopes for bookmarks * Add bookmarks to archive takeout * Fix migration * Coding style fixes * Fix rebase issue * Update bookmarked_statuses to latest UI changes * Update bookmark actions to properly reflect status changes in state * Add bookmarks item to single-column layout * Make active bookmarks red	6 years ago
Yamagishi Kazutoshi	afb398b583	Change to always returns html document in error pages (#12214)	6 years ago
Thibaut Girka	16ff7c5627	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb	6 years ago
Eugen Rochko	5f69eb89e2	Add a nodeinfo endpoint (#12002) ... * Add nodeinfo endpoint * dont commit stuff from my local dev * consistant naming since we implimented 2.1 schema * Add some additional node info stuff * Add nodeinfo endpoint * dont commit stuff from my local dev * consistant naming since we implimented 2.1 schema * expanding this to include federation info * codeclimate feedback * CC feedback * using activeserializers seems like a good idea... * get rid of draft 2.1 version * Reimplement 2.1, also fix metaData -> metadata * Fix metaData -> metadata here too * Fix nodeinfo 2.1 tests * Implement cache for monthly user aggregate * Useless * Remove ostatus from the list of supported protocols * Fix nodeinfo's open_registration reading obsolete setting variable * Only serialize domain blocks with user-facing limitations * Do not needlessly list noop severity in nodeinfo * Only serialize domain blocks info in nodeinfo when they are set to be displayed to everyone * Enable caching for nodeinfo endpoints * Fix rendering nodeinfo * CodeClimate fixes * Please CodeClimate * Change InstancePresenter#active_user_count_months for clarity * Refactor NodeInfoSerializer#metadata * Remove nodeinfo 2.1 support as the schema doesn't exist * Clean-up	6 years ago
Eugen Rochko	3ed94dcc1a	Add account migration UI (#11846) ... Fix #10736 - Change data export to be available for non-functional accounts - Change non-functional accounts to include redirecting accounts	6 years ago
Thibaut Girka	5cadb47238	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code	6 years ago
Eugen Rochko	e1066cd431	Add password challenge to 2FA settings, e-mail notifications (#11878) ... Fix #3961	6 years ago
Eugen Rochko	a4b60e9ba4	Fix TOTP codes not being filtered from logs during enabling/disabling (#11877) ... Not a serious issue because they are meaningless past single use	6 years ago
Eugen Rochko	c707ef49d9	Fix 2FA challenge and password challenge for non-database users (#11831) ... * Fix 2FA challenge not appearing for non-database users Fix #11685 * Fix account deletion not working when using external login Fix #11691	6 years ago
Thibaut Girka	b83e2df6b5	Fix tests being broken because of different default setting	6 years ago
Thibaut Girka	74c5b2bd08	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)	6 years ago
Eugen Rochko	18331fefa2	Remove deprecated `GET /api/v1/search` API (#11823) ... Use `GET /api/v2/search` instead	6 years ago
Eugen Rochko	c5d37f18cb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) ... Change all account actions except "none" to resolve all unresolved reports Refactor `SuspendAccountService` to be more readable	6 years ago
Tao Bror Bojlén	4fe127664b	add admin setting for default search engine indexing (fix #11750) (#11804)	6 years ago