17 Commits (b05cda87f8b2c79f009664929f0da81bf7d3aad1)

Author	SHA1	Message	Date
Thibaut Girka	a78447a6a4	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	cd51dfdd76	Add specs for UrlValidator (#9699)	6 years ago
ysksn	3cab7b9a17	Add specs for UnreservedUsernameValidator (#9698) ... * Add specs for UnreservedUsernameValidator * Use instance variable	6 years ago
Thibaut Girka	44f2224606	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	6 years ago
ysksn	41afd670c9	Add specs for FollowLimitValidator (#9655)	6 years ago
ysksn	5eb6d7e3e0	Add specs for BlackListedEmailValidator (#9651) ... * Add specs for BlackListedEmailValidator * Use instance variable	6 years ago
ysksn	a3b4684435	Add specs for DisallowedHashtagsValidator (#9653) ... In order to implement tests easier, `#select_tags` created.	6 years ago
ysksn	44c1647ea1	Add specs for StatusPinValidator (#9648)	6 years ago
ysksn	c4559969b4	Add pending specs for StatusLengthValidator (#9647) ... * Add pending specs of StatusLengthValidator * Use instance variable	6 years ago
Thibaut Girka	04204427d0	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.	6 years ago
Eugen Rochko	8d3910afdd	Improve e-mail MX validator and add tests (#9489)	6 years ago
Thibaut Girka	b62953b3d2	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.	6 years ago
ysksn	994c20699c	Remove pending spec (#9454) ... Since dots are not allowed in username, this spec is no longer needed.	6 years ago
David Yip	2567d0a704	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
unarist	0fb7252ac4	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	8fb6b02b54	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`.	7 years ago
Eugen Rochko	39b0588256	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	7 years ago