tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
mastodon/app/validators
History
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream 
Conflicts:
	app/javascript/mastodon/components/status_list.js
	app/javascript/mastodon/features/notifications/index.js
	app/javascript/mastodon/features/ui/components/modal_root.js
	app/javascript/mastodon/features/ui/components/onboarding_modal.js
	app/javascript/mastodon/features/ui/index.js
	app/javascript/styles/about.scss
	app/javascript/styles/accounts.scss
	app/javascript/styles/components.scss
	app/presenters/instance_presenter.rb
	app/services/post_status_service.rb
	app/services/reblog_service.rb
	app/views/about/more.html.haml
	app/views/about/show.html.haml
	app/views/accounts/_header.html.haml
	config/webpack/loaders/babel.js
	spec/controllers/api/v1/accounts/credentials_controller_spec.rb
 		2017-09-09 14:27:47 -05:00
..
blacklisted_email_validator.rb Correct validators so that existing error messages would look correct (#3668) 2017-06-09 19:46:01 +02:00
status_length_validator.rb Merge upstream (#111) 2017-08-01 13:20:29 -07:00
status_pin_validator.rb Pinned statuses (#4675) 2017-08-25 01:41:18 +02:00
unreserved_username_validator.rb Correct validators so that existing error messages would look correct (#3668) 2017-06-09 19:46:01 +02:00
url_validator.rb Punycode URI normalization (#2370) 2017-04-25 02:47:31 +02:00