35 Commits (6a5ba9d1293202f9ec115d1b67e2df84bb47bc15)

Author SHA1 Message Date
Jenkins a3a7b6a848 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
aschmitz cbaddc6447 Break out nested relationship API keys (#5887)
7 years ago
Jenkins 7fcbe5faee Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko bf8eab12ba Display list column (#5750)
7 years ago
David Yip 1dc24ece41 Merge remote-tracking branch 'tootsuite/master'
7 years ago
Eugen Rochko b89f614bd7 Profile redirect notes (#5746)
7 years ago
beatrix 61585f2c42 Merge pull request #223 from glitch-soc/glitchsoc/feature/configurable-status-size
7 years ago
David Yip f1279d8ff3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko e149067561 Lists (#5703)
7 years ago
David Yip e5a2158e2a Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size
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
David Yip 2aec3c073b Merge branch 'master' into gs-master
7 years ago
nullkal 0a9cc96cdc Feature: Unlisted custom emojis (#5485)
7 years ago
kibigo! 02827345ae Merge upstream 2.0ish #165
7 years ago
Eugen Rochko e589e17b61 In REST API, when URL can be missing, cast it to nil (#5259)
7 years ago
Eugen Rochko f37350c08f When processing custom emoji, ensure a non-animated version exists (#5230)
7 years ago
Eugen Rochko 795e624d5d Add ability to specify alternative text for media attachments (#5123)
7 years ago
Ondřej Hruška 0cc795db6b Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
7 years ago
Ondřej Hruška 914c0465b1 Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
7 years ago
Eugen Rochko 40399df3e4 Make sure nil IDs to not get cast to empty string in REST API (#5068)
7 years ago
Eugen Rochko f621e05356 New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)
7 years ago
aschmitz 618df7a5ee Change IDs to strings rather than numbers in API JSON output (#5019)
7 years ago
Akihiko Odaki b1ba673029 Introduce OStatus::TagManager (#5008)
7 years ago
Eugen Rochko eb345f8e8b Custom emoji (#4988)
7 years ago
Eugen Rochko 26c797bf0d When accessing uncached media attachment, redownload it (#4955)
7 years ago
Surinna Curtis 8a90d61de0 Define a serializer for /api/v1/mutes/details
7 years ago
Eugen Rochko 9ff429aa6d Uploads for admin site settings (#4913)
7 years ago
Eugen Rochko 3e20cb7025 Pinned statuses (#4675)
7 years ago
Gergely Nagy 8c3f5acf0e api/instances: Include the stats from the /about/more page (#4074)
7 years ago
Yamagishi Kazutoshi 865f5170a8 Add setting a always mark media as sensitive (#4136)
7 years ago
Yamagishi Kazutoshi 2ffd2303ee Add attribute for default privacy to verify credentials (#4075)
7 years ago
unarist 89c8a81ef9 Fix JSON serialization of media_attachment (#4111)
7 years ago
Eugen Rochko e921680ae5 Fix notifications including wrong status in JSON (#4097)
7 years ago
Eugen Rochko 20e15ecfb3 Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)
7 years ago