an 7126d53baf Merge branch 'master' of https://github.com/noiob/awoospace ... # Conflicts: # app/controllers/settings/preferences_controller.rb # app/helpers/settings_helper.rb # app/javascript/flavours/glitch/features/compose/components/compose_form.js # app/javascript/flavours/glitch/features/compose/components/publisher.js # app/javascript/flavours/glitch/styles/about.scss # app/javascript/flavours/glitch/styles/variables.scss # app/javascript/mastodon/features/ui/components/modal_root.js # app/javascript/styles/mastodon/variables.scss # app/lib/ostatus/activity/creation.rb # app/models/status.rb # app/services/pubsubhubbub/subscribe_service.rb # app/services/resolve_account_service.rb # app/services/send_interaction_service.rb # app/services/update_remote_profile_service.rb # app/validators/status_length_validator.rb # app/views/about/more.html.haml # app/views/about/show.html.haml # app/workers/pubsubhubbub/delivery_worker.rb # config/application.rb # config/locales/simple_form.en.yml		2019-12-21 22:29:34 -05:00
..
blacklisted_email_validator.rb	Fix “invited by” not showing up for invited accounts in admin interface (#10791)	2019-05-19 21:40:36 +02:00
disallowed_hashtags_validator.rb	Change admin UI for hashtags and add back whitelisted trends (#11490)	2019-08-05 19:54:29 +02:00
domain_validator.rb	Fix uncaught domain normalization error in remote follow (#11703)	2019-08-30 02:19:17 +02:00
email_mx_validator.rb	Fix encoding error when checking e-mail MX records (#11696)	2019-08-30 01:35:12 +02:00
existing_username_validator.rb	Fix admin validation being too strict about usernames (#10449)	2019-04-06 17:53:17 +02:00
follow_limit_validator.rb	Fix follow limit validator reporting lower number past threshold (#9230)	2018-11-08 21:06:01 +01:00
html_validator.rb	Change HTML validator to ignore all errors except unmatched tags (#10534)	2019-04-10 03:34:16 +02:00
note_length_validator.rb	Change note length validation to ignore mention domains and URLs (#9717)	2019-01-05 07:16:46 +01:00
poll_validator.rb	Increase the number of poll options to 10	2019-12-10 20:02:47 +01:00
status_length_validator.rb	Increase toot length limit to 16384 when a CW is used	2019-12-10 20:02:48 +01:00
status_pin_validator.rb	changed pinned status count operator	2019-04-29 20:52:53 +02:00
unique_username_validator.rb	Don't delete periods when validating username uniqueness (#11392) (#11400)	2019-07-24 14:19:17 +02:00
unreserved_username_validator.rb	Add specs for UnreservedUsernameValidator (#9698)	2019-01-03 13:10:02 +09:00
url_validator.rb	Change note length validation to ignore mention domains and URLs (#9717)	2019-01-05 07:16:46 +01:00
vote_validator.rb	Fix vote validation for polls with multiple choices (#10138)	2019-03-03 23:41:30 +01:00