mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2019-03-14	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.
2019-03-14	Admission-based registrations mode (#10250)	Eugen Rochko
	Fix #6856 Fix #6951
2019-03-08	Fix min/max duration poll limits being inverted	Thibaut Girka

2019-03-06	Serialize poll limits in instance serializer and initial state	Thibaut Girka

2019-02-17	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - app/serializers/rest/instance_serializer.rb - app/views/layouts/error.html.haml - public/oops.png Took our version (same as upstream but without the things that only make sense in an animation). Additional changes: - app/javascript/flavours/vanilla/theme.yml Include upstream's javascript in error pages.
2019-02-16	Add registrations attribute to instance entity in REST API (#10060)	Eugen Rochko
	Fix #9350
2018-03-09	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	Jenkins

2018-03-04	Do not fetch environment variables to determine default locale (#6618)	Akihiko Odaki
	The default locale is now set by config.
2018-03-02	Merge remote-tracking branch 'origin/master' into merge-upstream	David Yip
	Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml
2018-03-01	Add contact_account and languages to instance API (#6574)	Eugen Rochko

2018-01-04	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	Jenkins

2018-01-04	Fallback default thumbnail in instance status API (#6177)	Yamagishi Kazutoshi

2017-11-14	Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.	Lain Iwakura

2017-11-14	Return character limit in API and initial state.	Lain Iwakura

2017-09-14	Uploads for admin site settings (#4913)	Eugen Rochko
	* Improve OpenGraph tags for about pages * Add thumbnail admin setting * Fix error * Fix up
2017-08-08	api/instances: Include the stats from the /about/more page (#4074)	Gergely Nagy
	To be able to pull some basic statistics from a Mastodon instance, include the user, status and connected domain counters in the `/api/v1/instance` response. Fixes #3570. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2017-07-07	Refactor JSON templates to be generated with ActiveModelSerializers instead ↵	Eugen Rochko
	of Rabl (#4090)