44 Commits (dc58d02192baef0bd006d80f10f018f01dc5ff0f)

Author	SHA1	Message	Date
Claire	e2a2bc9021	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.	4 years ago
Eugen Rochko	b3ceb3dcc4	Add canonical e-mail blocks for suspended accounts (#16049) ... Prevent new accounts from being created using the same underlying e-mail as a suspended account using extensions and period permutations. Stores e-mails as a SHA256 hash	4 years ago
Claire	f60c99a8fb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Claire	051efed5ed	Bypass MX validation for explicitly allowed domains (#15930) ... * Bypass MX validation for explicitly allowed domains This spares some lookups and prevent issues in some edge cases with local domains. * Add tests * Fix test	4 years ago
Claire	3ad6ef72cb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Claire	a4dcaef53b	Prepare Mastodon for zeitwerk autoloader (#15917) ... * Prepare Mastodon for zeitwerk autoloader (Rails 6) Add inflections and rename/move a few classes. In particular, app/lib/exceptions.rb and app/lib/sanitize_config.rb were manually loaded while still in autoload paths. * Add inflection for Url → URL	4 years ago
Claire	1b6a21e6bc	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_length_validator.rb`: Conflict due to glitch-soc's configurable maximum toot chars. Ported upstream changes.	4 years ago
Claire	5614e6724e	Fix URL scanning in note length validator and preview card fetching (#15827) ... * Add tests * Fix URL scanning in note length validator and preview card fetching	4 years ago
Claire	d8fdbb054e	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.	4 years ago
Claire	65db262550	Update twitter-text from 1.14 to 3.1.0 and fix toot character counting (#15382) ... * Update twitter-text from 1.14 to 3.1.0 * Disable emoji parsing * Properly depend on twitter-text for url detection * Fix some URLs being wrongly detected client-side * Add test for server-side validation of non-autolinkable URLs * Fix server-side status length counting	4 years ago
Eugen Rochko	9aa37b32c3	Add `details` to error response for `POST /api/v1/accounts` in REST API (#15803)	4 years ago
Thibaut Girka	da62e350e0	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
ThibG	8d217d7231	Improve email address validation (#14565) ... * Increase DNS timeout from 1 second to 5 seconds for MX check 1 seconds is rather short when using a recursive DNS resolver which hasn't got a cached result already available. Use 5 seconds instead, which is the timeout value we use for outgoing HTTP queries. * Add more precise error messages for invalid e-mail addresses	5 years ago
Thibaut Girka	369201a425	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
abcang	61a7390b66	Search account domain in lowercase (#13016) ... * Search account domain in lowercase * fix rubocop error * fix spec/models/account_spec.rb	5 years ago
Thibaut Girka	27ddcddcd3	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Eugen Rochko	ae2198bd95	Fix validations of reactions limit (#12955)	5 years ago
Thibaut Girka	cad2e6eb7a	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	115dab78f1	Change admin UI for hashtags and add back whitelisted trends (#11490) ... Fix #271 Add back the `GET /api/v1/trends` API with the caveat that it does not return tags that have not been allowed to trend by the staff. When a hashtag begins to trend (internally) and that hashtag has not been previously reviewed by the staff, the staff is notified. The new admin UI for hashtags allows filtering hashtags by where they are used (e.g. in the profile directory), whether they have been reviewed or are pending reviewal, they show by how many people the hashtag is used in the directory, how many people used it today, how many statuses with it have been created today, and it allows fixing the name of the hashtag to make it more readable. The disallowed hashtags feature has been reworked. It is now controlled from the admin UI for hashtags instead of from the file `config/settings.yml`	6 years ago
Thibaut Girka	08a2af27c3	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	ae18386558	Fix “invited by” not showing up for invited accounts in admin interface (#10791)	6 years ago
Thibaut Girka	33c80e0783	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb	6 years ago
Eugen Rochko	7cb369d4c6	Change e-mail whitelist/blacklist to not be checked when invited (#10683) ... * Change e-mail whitelist/blacklist to not be checked when invited And only when creating an account, not when updating it later Fix #10648 * Fix test	6 years ago
Thibaut Girka	5085559b15	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.	6 years ago
Hinaloe	48f466daf1	Allow set the voting period to just 5 minutes (#10525) ... * Add spec of PollValidator for #10190 * Raise fraction less than 1 second * format * simplify time initialize	6 years ago
Thibaut Girka	0e34e91661	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Franck Zoccolo	4f0322dcae	Add support for IPv6 only MXes in Email validation (#10009) ... * Add support for IPv6 only MXes * Fixed email validator tests	6 years ago
Thibaut Girka	a2a64ecd3e	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.	6 years ago
ysksn	5efedb5d5e	Add specs for UrlValidator (#9699)	7 years ago
ysksn	19abf4ef0b	Add specs for UnreservedUsernameValidator (#9698) ... * Add specs for UnreservedUsernameValidator * Use instance variable	7 years ago
Thibaut Girka	571d219bb9	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock	7 years ago
ysksn	fb08039de5	Add specs for FollowLimitValidator (#9655)	7 years ago
ysksn	05edec6917	Add specs for BlackListedEmailValidator (#9651) ... * Add specs for BlackListedEmailValidator * Use instance variable	7 years ago
ysksn	4725aeec9f	Add specs for DisallowedHashtagsValidator (#9653) ... In order to implement tests easier, `#select_tags` created.	7 years ago
ysksn	d01c840e14	Add specs for StatusPinValidator (#9648)	7 years ago
ysksn	ccb9c1b952	Add pending specs for StatusLengthValidator (#9647) ... * Add pending specs of StatusLengthValidator * Use instance variable	7 years ago
Thibaut Girka	65e994b29b	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.	7 years ago
Eugen Rochko	dbb1ee269f	Improve e-mail MX validator and add tests (#9489)	7 years ago
Thibaut Girka	e7f1bfdc2d	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.	7 years ago
ysksn	57bb62d5cf	Remove pending spec (#9454) ... Since dots are not allowed in username, this spec is no longer needed.	7 years ago
David Yip	d2cdc2b5a3	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
unarist	a1d0915585	Add a spec for UniqueUsernameValidator (#6927) ... Note that this spec has a pending test about dots in the username, because allowing it has been reverted for now.	7 years ago
aschmitz	e18ed4bbc7	Fix StatusLengthValidator tests ... This fixes the StatusLengthValidator tests to use StatusLengthValidator::MAX_CHARS to derive the length of the strings tested, and so makes them resilient to changes in MAX_CHARS (such as the one that made these tests fail, with it being changed from 500 to 512). This seems a bit odd for some types of tests, but appears to make sense here, where the testing goes beyond `status.length > MAX_CHARS`.	8 years ago
Eugen Rochko	53b2b1b238	Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427) ... * Count all URLs in text as 23 characters flat, do not count domain part of usernames * Add new status text counting logic to web UI	8 years ago