monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/serializers/rest
History
Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
 		2020-03-22 16:10:44 +01:00
..
admin Add moderation API (#9387) 2019-06-20 02:52:34 +02:00
account_serializer.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00
announcement_serializer.rb Add support for links to statuses in announcements to be opened in web UI (#13212) 2020-03-08 16:10:48 +01:00
application_serializer.rb Add vapid_key to the application entity in the REST API (#10058) 2019-02-16 05:27:05 +01:00
context_serializer.rb Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090) 2017-07-07 04:02:06 +02:00
conversation_serializer.rb Add unread indicator to conversations (#9009) 2018-10-19 01:47:29 +02:00
credential_account_serializer.rb Change silences to always require approval on follow (#11975) 2019-09-27 21:13:51 +02:00
custom_emoji_serializer.rb Add categories for custom emojis (#11196) 2019-06-28 15:54:10 +02:00
featured_tag_serializer.rb Add featured tags API (#11778) 2019-09-09 10:50:33 +02:00
filter_serializer.rb Fix filter ID not being a string in REST API (#9303) 2018-11-19 10:37:57 +01:00
identity_proof_serializer.rb squashed identity proof updates (#10375) 2019-03-28 18:01:09 +01:00
instance_serializer.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
list_serializer.rb Add backend support to read and update list-specific show_replies settings 2018-11-28 14:46:07 +01:00
marker_serializer.rb Add timeline read markers API (#11762) 2019-09-06 13:55:51 +02:00
media_attachment_serializer.rb Change local media attachments to perform heavy processing asynchronously (#13210) 2020-03-08 23:56:18 +01:00
mute_serializer.rb Define a serializer for /api/v1/mutes/details 2017-09-13 21:47:30 -05:00
notification_serializer.rb Support pushing and receiving updates to poll tallies (#10209) 2019-03-11 00:49:31 +01:00
poll_serializer.rb Add voters count support (#11917) 2019-09-29 22:58:01 +02:00
preferences_serializer.rb Add a preferences API so apps can share basic behaviours (#10109) 2019-03-15 02:39:20 +01:00
preview_card_serializer.rb Add embed_url to preview cards (#5775) 2017-12-07 03:37:43 +01:00
reaction_serializer.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
relationship_serializer.rb Improve blocked view of profiles (#10491) 2019-04-07 04:59:13 +02:00
report_serializer.rb Change IDs to strings rather than numbers in API JSON output (#5019) 2017-09-20 14:53:48 +02:00
scheduled_status_serializer.rb Fix wrong param name in scheduled statuses and return params in API (#9725) 2019-01-06 12:03:27 +01:00
search_serializer.rb Remove deprecated `GET /api/v1/search` API (#11823) 2019-09-13 16:11:13 +02:00
status_serializer.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-02-06 21:36:38 +01:00
tag_serializer.rb Track trending tags (#7638) 2018-05-27 21:45:30 +02:00
web_push_subscription_serializer.rb Fix `alerts` booleans not being typecast correctly in push subscription (#11343) 2019-07-21 18:10:07 +02:00