namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
chuckya/app/serializers/rest
History
Claire 92c06a1113 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/admin/base_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
- `app/javascript/mastodon/initial_state.js`:
  Minor conflict caused by glitch-soc making use of max_toot_chars.
- `app/models/form/admin_settings.rb`:
  Minor conflict caused by glitch-soc's theming system.
- `app/models/trends.rb`:
  Minor conflict caused by glitch-soc having more granular
  notification settings for trends.
- `app/views/admin/accounts/index.html.haml`:
  Minor conflict caused by glitch-soc's theming system.
- `app/views/admin/instances/show.html.haml`:
  Minor conflict caused by glitch-soc's theming system.
- `app/views/layouts/application.html.haml`:
  Minor conflict caused by glitch-soc's theming system.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Minor conflict caused by glitch-soc having more granular
  notification settings for trends.
- `config/navigation.rb`:
  Minor conflict caused by glitch-soc having additional
  navigation items for the theming system while upstream
  slightly changed every line.
2022-07-05 09:33:44 +02:00
..
admin Add notifications for new reports (#18697) 2022-06-27 09:30:15 +02:00
keys Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
trends Add trending links (#16917) 2021-11-25 13:07:38 +01:00
v1 Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
account_serializer.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-05-11 09:37:48 +02:00
announcement_serializer.rb Refactor formatter (#17828) 2022-03-26 02:53:34 +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 Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
custom_emoji_serializer.rb Add categories for custom emojis (#11196) 2019-06-28 15:54:10 +02:00
encrypted_message_serializer.rb Fix wrong route helper in encrypted messages controller (#13952) 2020-06-03 20:32:15 +02:00
familiar_followers_serializer.rb Add /api/v1/accounts/familiar_followers to REST API (#17700) 2022-03-07 09:36:47 +01:00
featured_tag_serializer.rb Use existing FeaturedTag serializer and delete AccountFeaturedTag serializer (#15415) 2020-12-23 16:43:38 +01:00
filter_keyword_serializer.rb Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
filter_result_serializer.rb Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
filter_serializer.rb Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
instance_serializer.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
list_serializer.rb Add configuration option to filter replies in lists (#9205) 2020-09-01 13:31:28 +02:00
marker_serializer.rb Add timeline read markers API (#11762) 2019-09-06 13:55:51 +02:00
media_attachment_serializer.rb Stop setting a shortcode to newly-created media attachments (#16730) 2021-09-13 18:59:37 +02:00
mute_serializer.rb Define a serializer for /api/v1/mutes/details 2017-09-13 21:47:30 -05:00
muted_account_serializer.rb Add duration parameter to muting. (#13831) 2020-10-13 01:01:14 +02:00
notification_serializer.rb Add notifications for new reports (#18697) 2022-06-27 09:30:15 +02:00
poll_serializer.rb Add voters count support (#11917) 2019-09-29 22:58:01 +02:00
preferences_serializer.rb Fix preferred posting language returning unusable value in REST API (#18428) 2022-05-16 19:13:36 +02:00
preview_card_serializer.rb Add blurhash to preview cards (#13984) 2020-06-05 23:10:41 +02:00
reaction_serializer.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
relationship_serializer.rb Add option to be notified when a followed user posts (#13546) 2020-09-18 17:26:45 +02:00
report_serializer.rb Add notifications for new reports (#18697) 2022-06-27 09:30:15 +02:00
role_serializer.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
rule_serializer.rb Add server rules (#15769) 2021-02-21 19:50:12 +01: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_edit_serializer.rb Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
status_serializer.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
status_source_serializer.rb Add content-type to status source in glitch-soc 2022-01-20 00:03:44 +01:00
suggestion_serializer.rb Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02: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