You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Eugen Rochko 2a7602cad4 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master		8 years ago
..
admin	Pagination improvements (#1445)	8 years ago
api	API param to exclude notification types from response (#1341)	8 years ago
auth	New admin setting: open/close registrations, with custom message, from the admin UI	8 years ago
concerns	Use HTTP Accept-Language to detect locale (#1166)	8 years ago
oauth	Fix #1165 - before_action was called before protect_from_forgery	8 years ago
settings	Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master	8 years ago
about_controller.rb	Clean up about page (#1282)	8 years ago
accounts_controller.rb	Pagination improvements (#1445)	8 years ago
api_controller.rb	Do not store last visited URL from API controllers (#1330)	8 years ago
application_controller.rb	Fix #1165 - before_action was called before protect_from_forgery	8 years ago
authorize_follow_controller.rb	Add validation of media attachments, clean up mastodon-own exception classes	8 years ago
home_controller.rb	Persist UI settings, add missing localizations for German	8 years ago
media_controller.rb	Fix #416 - Generate random unique 14-byte (19 characters) shortcodes	8 years ago
remote_follow_controller.rb	Clean up generation of account webfinger string (#1477)	8 years ago
statuses_controller.rb	Prettier account and stream entry URLs	8 years ago
stream_entries_controller.rb	Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1124)	8 years ago
tags_controller.rb	Fix public tags page	8 years ago
xrd_controller.rb	Clean up generation of account webfinger string (#1477)	8 years ago