152 Commits (a53f2cf970e798ddd4f94025406989ca4ef41dba)

Author	SHA1	Message	Date
Jeremy Kescher	40ef7b3849	Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/initial_state.js # app/serializers/initial_state_serializer.rb	3 months ago
JS Moore	541cbdd963	Add env variable support for number of followable hashtags in feed column (#2500) ... * Add env variable support for number of followable hashtags in feed column. * Add a note about performance concerns for higher values. See discussion in https://github.com/glitch-soc/mastodon/pull/2500 * Update .devcontainer/docker-compose.yml --------- Co-authored-by: Claire <claire.github-309c@sitedethib.com>	3 months ago
Jeremy Kescher	0406f173cf	Merge remote-tracking branch 'reactions/main' into develop ... # Conflicts: # app/javascript/flavours/glitch/locales/de.js	1 year ago
Jeremy Kescher	a1a1d08890	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # Gemfile.lock	1 year ago
Claire	f3a4d57be1	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring	1 year ago
Christopher Nethercott	c649f4d386	fix: remove SMTP_SERVER (#21342) ... Firstly, mailgun.com is now their domain. Secondly they are lots of providers to use; and sysadmins should be able to choose.	1 year ago
anna	6d2ad83c02	make number of displayed reactions a setting ... This adds an extra item to the local settings for specifying the number of reactions shown in toots. The detailed status view always shows all reactions.	1 year ago
anna	4577711201	make frontend fetch reaction limit ... the maximum number of reactions was previously hardcoded to 8. this commit also fixes an incorrect query in StatusReactionValidator where it didn't count per-user reactions but the total amount of different ones.	1 year ago
anna	092e42a567	make status reaction count limit configurable	1 year ago
Jeremy Kescher	3d2fc73ecb	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # app/javascript/mastodon/initial_state.js	2 years ago
prplecake	f359b15303	Allow number of trending hashtags to be customizable (#1884)	2 years ago
Jeremy Kescher	41885c8715	Remove/update old "tootsuite" references, except those needed for Docker (#1860)	2 years ago
Jeremy Kescher	d09dd82fbd	Remove/update old "tootsuite" references, except those needed for Docker	2 years ago
Jeremy Kescher	1c107575d8	Update poll validation to allow one-option polls if configured	2 years ago
Jeremy Kescher	554ac88290	Revert "Allow adjusting avatar sizes (local and remote) via config" ... This reverts commit df02b66295.	2 years ago
Jeremy Kescher	df02b66295	Allow adjusting avatar sizes (local and remote) via config	2 years ago
Jeremy Kescher	b42a3bcbfc	Remove extraneous stuff from .env.production.sample	2 years ago
Jeremy Kescher	791363f1d2	Merge remote-tracking branch 'upstream/main' into develop	2 years ago
Claire	6c0d73a675	Change default values for emoji limits in .env.production.sample and comment them out	2 years ago
Claire	cd87d7dcef	Merge branch 'main' into glitch-soc/merge-upstream ... - `.env.production.sample`: Our sample config file is very different from upstream since it is much more complete. Upstream added documentation for a few env variables. Copied the new variables/documentation from upstream. - `app/lib/feed_manager.rb`: Upstream added a timeline type (hashtags), while glitch-soc already had an extra one (direct messages). Not really a conflict but textually close changes. Ported upstream's changes. - `app/models/custom_emoji.rb`: Upstream upped the custom emoji size limit, while glitch-soc had configurable limits. Upped the default limits accordingly. - `streaming/index.js`: Upstream reworked how hastags were normalized. Minor conflict due to glitch-soc's handling of instance-local posts. Ported upstream's changes.	2 years ago
Jeremy Kescher	25e076505e	ip_cleanup_scheduler: Make IP and session retention configurable (#18757)	2 years ago
Jeremy Kescher	54426b77d0	ip_cleanup_scheduler: Introduce separate session retention period	2 years ago
Jeremy Kescher	1afaba9639	Clarify IP_RETENTION_PERIOD caveats in .env.production.sample	2 years ago
Jeremy Kescher	97d03110ed	Allow modifying IP retention period ... To allow IP addresses to not be stored for an entire year. This attempts to fix https://github.com/mastodon/mastodon/issues/6474 for Catstodon.	2 years ago
Claire	1fbd1fa5c4	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/lib/user_settings_decorator.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/models/status.rb`: Conflict because of slight change in how glitch-soc handles the scope to filter out local-only posts for anonymous viewers. Took upstream's changes and re-applied glitch-soc's change. - `app/models/user.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/views/directories/index.html.haml`: Conflict because upstream redesigned that page while glitch-soc had a minor change to support hiding the number of followers. Ported glitch-soc's change on top of upstream's redesign. Additional changes: - `app/models/account_statuses_filter.rb`: See change to `app/models/status.rb`.	2 years ago
Josh Soref	b5329e0035	Spelling (#17705) ... * spelling: account Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: affiliated Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: appearance Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: autosuggest Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: cacheable Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: component Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: conversations Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: domain.example Clarify what's distinct and use RFC friendly domain space. Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: environment Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: exceeds Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: functional Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: inefficiency Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: not Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: notifications Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: occurring Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: position Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: progress Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: promotable Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: reblogging Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: repetitive Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: resolve Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: saturated Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: similar Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: strategies Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: success Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: targeting Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: thumbnails Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: unauthorized Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: unsensitizes Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: validations Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: various Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>	2 years ago
Claire	1b493c9fee	Add optional hCaptcha support ... Fixes #1649 This requires setting `HCAPTCHA_SECRET_KEY` and `HCAPTCHA_SITE_KEY`, then enabling the admin setting at `/admin/settings/edit#form_admin_settings_captcha_enabled` Subsequently, a hCaptcha widget will be displayed on `/about` and `/auth/sign_up` unless: - the user is already signed-up already - the user has used an invite link - the user has already solved the captcha (and registration failed for another reason) The Content-Security-Policy headers are altered automatically to allow the third-party hCaptcha scripts on `/about` and `/auth/sign_up` following the same rules as above.	2 years ago
Claire	9b861d56a9	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.	2 years ago
Takeshi Umeda	06631fdc53	Fix ElasticSearch to Elasticsearch (#17050)	2 years ago
Claire	e855df149b	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream added new configuration options, uncommented by default. Commented them. - `Gemfile.lock`: Upstream updated dependencies textually close to glitch-soc-specific dependencies. Updated those upstream dependencies.	3 years ago
Claire	5ba46952af	Fix mastodon:setup to take dotenv/docker-compose differences into account (#16896) ... In order to work around https://github.com/mastodon/mastodon/issues/16895, add a warning to .env.production.sample, and change the mastodon:setup rake task to: - output a warning if a variable will be interpreted differently by dotenv and docker-compose - ensure the printed config is compatible with docker-compose	3 years ago
Jeong Arm	c8ce728705	Support authentication for ElasticSearch (#16890) ... * Support authentication for ElasticSearch * Fix chewy auth settings	3 years ago
Claire	a346912030	Add environment variables to control custom emoji size limits ... Fixes #1524	3 years ago
leo60228	ca6c62068e	Support customizing poll option limits	3 years ago
Thibaut Girka	3f60b096b5	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/routes.rb`: Upstream disabled E2EE routes, which we did earlier, but slightly differently. Took upstream's version.	4 years ago
夕日	58204175cc	Fix the wrong full documentation link (#14293)	4 years ago
Thibaut Girka	2d8be0a6e1	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream changed it completely. Changed ours to merge upstream's new structure, but keeping most of the information.	4 years ago
Eugen Rochko	2f2ab48b75	Add back a cleaner and leaner .env.production.sample (#14206)	4 years ago
Thibaut Girka	3d7ce178dd	Use allow/deny-list instead of white/black-list in .env.production.sample ... .env.production.sample has been nuked upstream, but we decided to keep it, so change it to reflect latest changes in environment variable names. (The link still refers to “whitelist_mode” because the documentation hasn't been updated yet)	4 years ago
Eugen Rochko	8c04e37b03	Remove the terms blacklist and whitelist from UX (#14149) ... Localization strings: - "Whitelist mode" -> "Limited federation mode" - "Blacklist e-mail domain" -> "Block e-mail domain" - "Whitelist domain" -> "Allow domain for federation" ...And so on Environment variables (backwards-compatible): - `WHITELIST_MODE` -> `LIMITED_FEDERATION_MODE` - `EMAIL_DOMAIN_BLACKLIST` -> `EMAIL_DOMAIN_DENYLIST` - `EMAIL_DOMAIN_WHITELIST` -> `EMAIL_DOMAIN_ALLOWLIST` tootctl: - `tootctl domains purge --whitelist-mode` -> `tootctl domains purge --limited-federation-mode` Removed badly maintained and no longer relevant .env.production.sample file	4 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.	4 years ago
Denis Teyssier	73f3842284	Updated docker-compose snippet to a working one (#13196) ... added 'bundle exec' before rake	4 years ago
Thibaut Girka	ccaefd139d	Add environment variable to specify extra data hosts ... Fixes #1276	4 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	4 years ago
ThibG	27f9aa3477	Document AUTHORIZED_FETCH mode and WHITELIST_MODE (#12856) ... * Document AUTHORIZED_FETCH mode and WHITELIST_MODE * Replace extended description with a link to the online docs	4 years ago
Thibaut Girka	ad29279214	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md` - `package.json`	4 years ago
Aries	44f88a334b	Fix sample SAML_ACS_URL, SAML_ISSUER (#12669)	4 years ago
Thibaut Girka	abcba5c198	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc.	4 years ago
Mathieu Brunot	bd8dc9bd0c	✨ Add an LDAP Mail attribute config (#12053) ... Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>	5 years ago
Thibaut Girka	99f1f48741	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago