13 Commits (31017d18a5b63bdc907c998f8bac1de2ca9c5f21)

Author	SHA1	Message	Date
Thibaut Girka	da24c6aced	Merge branch 'master' into glitch-soc/merge-upstream ... 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.	6 years ago
Eugen Rochko	c7b6f2f6c6	Add registrations attribute to instance entity in REST API (#10060) ... Fix #9350	6 years ago
Jenkins	54608d0486	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	0016fd40e7	Do not fetch environment variables to determine default locale (#6618) ... The default locale is now set by config.	7 years ago
David Yip	c08c971dd3	Merge remote-tracking branch 'origin/master' into merge-upstream ... 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	7 years ago
Eugen Rochko	c421ad685d	Add contact_account and languages to instance API (#6574)	7 years ago
Jenkins	796a39a283	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Yamagishi Kazutoshi	f92399cfe7	Fallback default thumbnail in instance status API (#6177)	7 years ago
Lain Iwakura	a77e03ede4	Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.	7 years ago
Lain Iwakura	a45f3cdc69	Return character limit in API and initial state.	7 years ago
Eugen Rochko	9ff429aa6d	Uploads for admin site settings (#4913) ... * Improve OpenGraph tags for about pages * Add thumbnail admin setting * Fix error * Fix up	7 years ago
Gergely Nagy	8c3f5acf0e	api/instances: Include the stats from the /about/more page (#4074) ... 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>	7 years ago
Eugen Rochko	20e15ecfb3	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	7 years ago