David Yip
1b8fcd4df5
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
2018-03-02 21:46:44 -06:00
Eugen Rochko
a3c4138197
Add contact_account and languages to instance API ( #6574 )
2018-03-01 20:48:11 +01:00
Jenkins
c69a23ae46
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-04 23:17:11 +00:00
Yamagishi Kazutoshi
3c18964256
Fallback default thumbnail in instance status API ( #6177 )
2018-01-04 15:36:55 +01:00
Lain Iwakura
ca5440b93d
Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.
2017-11-14 17:56:38 +01:00
Lain Iwakura
a4dcabc11b
Return character limit in API and initial state.
2017-11-14 16:23:12 +01:00
Eugen Rochko
9239e4ce4d
Uploads for admin site settings ( #4913 )
...
* Improve OpenGraph tags for about pages
* Add thumbnail admin setting
* Fix error
* Fix up
2017-09-14 00:04:30 +02:00
Gergely Nagy
2ebe4ff568
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>
2017-08-08 22:18:12 +02:00
Eugen Rochko
8b2cad5637
Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl ( #4090 )
2017-07-07 04:02:06 +02:00
