mastodon

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	08a2af27c3	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
ThibG	ae18386558	Fix “invited by” not showing up for invited accounts in admin interface (#10791 )	7 years ago
Thibaut Girka	33c80e0783	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/media_attachment.rb	7 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	7 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.	7 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	7 years ago
Thibaut Girka	0e34e91661	Merge branch 'master' into glitch-soc/merge-upstream	7 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	7 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.	7 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	8 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.	8 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	9 years ago

25 Commits (d6a7d62dc698d6ebaa3a40f44c20ef12f8474fd7)