mastodon

Commit Graph

Author	SHA1	Message	Date
Claire	92c06a1113	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/controllers/admin/base_controller.rb`: Minor conflict caused by glitch-soc's theming system. - `app/javascript/mastodon/initial_state.js`: Minor conflict caused by glitch-soc making use of max_toot_chars. - `app/models/form/admin_settings.rb`: Minor conflict caused by glitch-soc's theming system. - `app/models/trends.rb`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `app/views/admin/accounts/index.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/admin/instances/show.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/layouts/application.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/settings/preferences/notifications/show.html.haml`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `config/navigation.rb`: Minor conflict caused by glitch-soc having additional navigation items for the theming system while upstream slightly changed every line.	3 years ago
Eugen Rochko	44b2ee3485	Add customizable user roles (#18641 ) * Add customizable user roles * Various fixes and improvements * Add migration for old settings and fix tootctl role management	3 years ago
Claire	fe5f6bc7ed	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property	3 years ago
Claire	02851848e9	Revamp post filtering system (#18058 ) * Add model for custom filter keywords * Use CustomFilterKeyword internally Does not change the API * Fix /filters/edit and /filters/new * Add migration tests * Remove whole_word column from custom_filters (covered by custom_filter_keywords) * Redesign /filters Instead of a list, present a card that displays more information and handles multiple keywords per filter. * Redesign /filters/new and /filters/edit to add and remove keywords This adds a new gem dependency: cocoon, as well as a npm dependency: cocoon-js-vanilla. Those are used to easily populate and remove form fields from the user interface when manipulating multiple keyword filters at once. * Add /api/v2/filters to edit filter with multiple keywords Entities: - `Filter`: `id`, `title`, `filter_action` (either `hide` or `warn`), `context` `keywords` - `FilterKeyword`: `id`, `keyword`, `whole_word` API endpoits: - `GET /api/v2/filters` to list filters (including keywords) - `POST /api/v2/filters` to create a new filter `keywords_attributes` can also be passed to create keywords in one request - `GET /api/v2/filters/:id` to read a particular filter - `PUT /api/v2/filters/:id` to update a new filter `keywords_attributes` can also be passed to edit, delete or add keywords in one request - `DELETE /api/v2/filters/:id` to delete a particular filter - `GET /api/v2/filters/:id/keywords` to list keywords for a filter - `POST /api/v2/filters/:filter_id/keywords/:id` to add a new keyword to a filter - `GET /api/v2/filter_keywords/:id` to read a particular keyword - `PUT /api/v2/filter_keywords/:id` to edit a particular keyword - `DELETE /api/v2/filter_keywords/:id` to delete a particular keyword * Change from `irreversible` boolean to `action` enum * Remove irrelevent `irreversible_must_be_within_context` check * Fix /filters/new and /filters/edit with update for filter_action * Fix Rubocop/Codeclimate complaining about task names * Refactor FeedManager#phrase_filtered? This moves regexp building and filter caching to the `CustomFilter` class. This does not change the functional behavior yet, but this changes how the cache is built, doing per-custom_filter regexps so that filters can be matched independently, while still offering caching. * Perform server-side filtering and output result in REST API * Fix numerous filters_changed events being sent when editing multiple keywords at once * Add some tests * Use the new API in the WebUI - use client-side logic for filters we have fetched rules for. This is so that filter changes can be retroactively applied without reloading the UI. - use server-side logic for filters we haven't fetched rules for yet (e.g. network error, or initial timeline loading) * Minor optimizations and refactoring * Perform server-side filtering on the streaming server * Change the wording of filter action labels * Fix issues pointed out by linter * Change design of “Show anyway” link in accordence to review comments * Drop “irreversible” filtering behavior * Move /api/v2/filter_keywords to /api/v1/filters/keywords * Rename `filter_results` attribute to `filtered` * Rename REST::LegacyFilterSerializer to REST::V1::FilterSerializer * Fix systemChannelId value in streaming server * Simplify code by removing client-side filtering code The simplifcation comes at a cost though: filters aren't retroactively applied anymore.	3 years ago
Claire	0e74d4da59	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Changed upstream, while we modified it in glitch-soc to not get spammed by dependabot. Kept it removed. - `README.md`: Changed upstream, which has a very different version. Discarded upstream changes.	3 years ago
Eugen Rochko	fe2d6fe105	Fix wrong aspect ratio of logo in icons (#18639 )	3 years ago
Claire	15929a3d59	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.	3 years ago
Eugen Rochko	45aa5781ce	Change brand color and logotypes (#18592 ) - Add rake task for generating Apple/Android icons and favicons from SVG - Add rake task for generating PNG icons and logos for e-mails from SVG - Remove obsolete Microsoft icons and configuration - Remove PWA shortcut icons	3 years ago
Claire	25a46d9e59	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/javascript/styles/fonts/montserrat.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto-mono.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/models/account.rb`: Textual conflict only caused by glitch-soc using a different value for character limits in a nearby line. Applied upstream's changes. - `app/views/statuses/_simple_status.html.haml`: Attribute added to a tag modified by glitch-soc. Added upstream's attributes. - `yarn.lock`: Upstream added/updated dependencies close to glitch-soc-only ones. Updated/added upstream dependencies.	3 years ago
Claire	9d4861b498	Remove dependency on running Redis server for db:setup (#18560 )	3 years ago
Claire	3f10136a41	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	fbcbf7898f	Bump version to 3.5.3 (#18530 )	3 years ago
Claire	22111914bf	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	a9b64b24d6	Change algorithm of `tootctl search deploy` to improve performance (#18463 )	3 years ago
Eugen Rochko	679b7158e3	Change search indexing to use batches to minimize resource usage (#18451 )	3 years ago
Claire	5fd8780b14	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `package.json`: Not really a conflict, upstream updated a dependency textually adjacent to a glitch-soc-only one. Updated the dependency as upstream did.	3 years ago
Claire	f714e24ff1	Fix redis configuration not being changed by mastodon:setup (#18383 ) Fixes #18342	3 years ago
Claire	c85c3fb708	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `package.json`: Upstream updated `jest`, moving its config in a separate file. This config was modified in glitch-soc, so the corresponding changes have been ported to `jest.config.js`	3 years ago
Claire	014065913c	Bump version to 3.5.2 (#18295 ) * Bump version to 3.5.2 * Change some entries to be more clear * Add some extra notes * Fix line wrap Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	3 years ago
Claire	3869daef09	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `package.json`: Not really a conflict, upstream updated a dependency textually adjacent to a glitch-soc-only one. Updated the dependency as upstream did.	3 years ago
Claire	bc19c083ce	Add ability to set approval-based registration through tootctl (#18248 ) Fixes #18235 Add `tootctl settings registrations approved` with optional `--require-reason` switch.	3 years ago
Claire	392ca0472a	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.	3 years ago
Eugen Rochko	7b0fe4aef9	Fix opening and closing Redis connections instead of using a pool (#18171 ) * Fix opening and closing Redis connections instead of using a pool * Fix Redis connections not being returned to the pool in CLI commands	3 years ago
Gaelan Steele	74e20f22cd	Fix light-mode emoji borders. (#18131 )	3 years ago
Claire	f23f784f18	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	3917353645	Fix single Redis connection being used across all threads (#18135 ) * Fix single Redis connection being used across all Sidekiq threads * Fix tests	3 years ago
Claire	fc1dd81ea5	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `package.json`: Not a real conflict, upstream dependency updated textually too close to a glitch-soc-only dependency. Updated the upstream dependency.	3 years ago
Claire	33cd80d69c	Fix instance actor being incorrectly created when running migrations (#18109 ) * Add migration test about instance actor key * Fix old migration * Work around incorrect database state	3 years ago
Claire	f2b2614d0a	Fix link sanitization for outgoing text/html and text/markdown toots Fixes #1739	3 years ago
Claire	eff62528de	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	ed5491e5de	Bump version to 3.5.1 (#18000 )	3 years ago
0x2019	012537452a	Fix error resposes for `from` search prefix (#17963 ) * Fix error responses in `from` search prefix (addresses mastodon/mastodon#17941) Using unsupported prefixes now reports a 422; searching for posts from an account the instance is not aware of reports a 404. TODO: The UI for this on the front end is abysmal. Searching `from:username@domain` now succeeds when `domain` is the local domain; searching `from:@username(@domain)?` now works as expected. * Remove unused methods on new Error classes as they are not being used Currently when `raise`d there are error messages being supplied, but this is not actually being used. The associated `raise`s have been edited accordingly. * Remove needless comments * Satisfy rubocop * Try fixing tests being unable to find AccountFindingConcern methods * Satisfy rubocop * Simplify `from` prefix logic This incorporates @ClearlyClaire's suggestion (see https://github.com/mastodon/mastodon/pull/17963#pullrequestreview-933986737). Accepctable account strings in `from:` clauses are more lenient than before this commit; for example, `from:@user@example.org@asnteo +cat` will not error, and return posts by @user@example.org containing the word "cat". This is more consistent with how Mastodon matches mentions in statuses. In addition, `from` clauses will not be checked for syntatically invalid usernames or domain names, simply 404ing when `Account.find_remote!` raises ActiveRecord::NotFound. New code for this PR that is no longer used has been removed.	3 years ago
Claire	ff73d43b35	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: Not a real conflict, just an upstream dependency udpated textually too close to a glitch-soc-only dependency. Updated dependencies like upstream. - `app/controllers/settings/preferences_controller.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `app/models/user.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `config/i18n-tasks.yml`: Not a real conflict, just a new upstream line too textually close to a glitch-soc-only line. Ported upstream's change.	3 years ago
Eugen Rochko	6e418bf346	Fix cookies secure flag being set when served over Tor (#17992 )	3 years ago
Claire	cb45c04d26	Fix migration error handling (#17991 )	3 years ago
Claire	5f0fc639da	Fix error re-running some migrations if they get interrupted at the wrong moment (#17989 )	3 years ago
Claire	b368c75029	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did.	3 years ago
Eugen Rochko	6221b36b27	Remove sign-in token authentication, instead send e-mail about new sign-in (#17970 )	3 years ago
Claire	d01c5b0b8c	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Holger	39b489ba4c	fix: `s3_force_single_request` not parsed (#17922 )	3 years ago
Claire	fc5dd0c538	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	8c7223f4ea	Bump version to 3.5.0 (#17911 )	3 years ago
Claire	61cefbebf7	Add advanced text formatting back into glitch-soc	3 years ago
Claire	aaa9ec340b	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/lib/formatter.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit. - `app/models/status.rb`: Upstream refactored status edit handling and moved code to `app/models/concerns/status_snapshot_concern.rb`. Applied glitch-soc's changes to that file. - `app/serializers/activitypub/note_serializer.rb`: Not really a conflict, just a line added too close to one modified by glitch-soc. Applied upstream changes while keeping the glitch-soc-modified one. - `app/services/update_status_service.rb`: Not really a conflict, upstream modified a line adjacent to one added by glitch-soc. Applied upstream changes while keeping the glitch-soc line. - `app/views/statuses/_simple_status.html.haml`: Upstream refactored formatting, glitch-soc changed the markup slightly. Applied upstream changes. - `spec/lib/formatter_spec.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit.	3 years ago
Eugen Rochko	d7d049aab7	Bump version to 3.5.0rc3 (#17876 )	3 years ago
Eugen Rochko	07f8b4d1b1	Bump version to 3.5.0rc2 (#17855 )	3 years ago
Claire	59864ff495	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Upstream modified it, but we deleted it in glitch-soc. Keep it deleted.	3 years ago
Claire	3afd59df0f	Fix tootctl email_domain_blocks add (#17842 ) Fixes #17831	3 years ago
Claire	4e3c68e025	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/helpers/accounts_helper.rb`: Upstream fixed an issue that glitch-soc did not have, in a place with glitch-soc changes to hide the number of followers. Kept glitch-soc's code.	3 years ago
Claire	b07906bdb0	Fix wrong language code for Kurdish languages (#17812 )	3 years ago

1 2 3 4 5 ...

804 Commits (75279377583c6e2aa04cc8d7380c593979630b38)