21 Commits (42f2045c217df4b482e6ce70615a1d3252e0e972)

Author SHA1 Message Date
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
Eugen Rochko 967e70663f In REST API, when URL can be missing, cast it to nil (#5259)
7 years ago
Eugen Rochko b9c76e2edb When processing custom emoji, ensure a non-animated version exists (#5230)
7 years ago
Eugen Rochko 4ec1771165 Add ability to specify alternative text for media attachments (#5123)
7 years ago
Ondřej Hruška 83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
7 years ago
Ondřej Hruška 9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
7 years ago
Eugen Rochko adc38078dd Make sure nil IDs to not get cast to empty string in REST API (#5068)
7 years ago
Eugen Rochko 293972f716 New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)
7 years ago
aschmitz 669fe9ee06 Change IDs to strings rather than numbers in API JSON output (#5019)
7 years ago
Akihiko Odaki bb4d005a83 Introduce OStatus::TagManager (#5008)
7 years ago
Eugen Rochko 81cec35dbf Custom emoji (#4988)
7 years ago
Eugen Rochko 54edb4b853 When accessing uncached media attachment, redownload it (#4955)
7 years ago
Surinna Curtis af2d793398 Define a serializer for /api/v1/mutes/details
7 years ago
Eugen Rochko 9239e4ce4d Uploads for admin site settings (#4913)
7 years ago
Eugen Rochko 9caa90025f Pinned statuses (#4675)
7 years ago
Gergely Nagy 2ebe4ff568 api/instances: Include the stats from the /about/more page (#4074)
7 years ago
Yamagishi Kazutoshi 2b9721d1b3 Add setting a always mark media as sensitive (#4136)
7 years ago
Yamagishi Kazutoshi f8212da329 Add attribute for default privacy to verify credentials (#4075)
7 years ago
unarist 102466ac58 Fix JSON serialization of media_attachment (#4111)
7 years ago
Eugen Rochko 6e1261f277 Fix notifications including wrong status in JSON (#4097)
7 years ago
Eugen Rochko 8b2cad5637 Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)
7 years ago