1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-25 10:17:47 +00:00
mastodon/app/serializers
Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- .eslintrc.yml
  Removed, as upstream removed it.
- app/controllers/admin/statuses_controller.rb
  Minor code cleanup when porting one of our features.
- app/models/account.rb
  Note length validation has changed upstream.
  We now use upstream's validation (dropped legacy glitch-soc
  account metadata stuff) but with configurable limit.
- app/services/post_status_service.rb
  Upstream has added support for scheduled toots, refactoring
  the code a bit. Adapted our changes to this refactoring.
- app/views/stream_entries/_detailed_status.html.haml
  Not a real conflict, changes too close.
- app/views/stream_entries/_simple_status.html.haml
  Not a real conflict, changes too close.
2019-01-10 21:00:30 +01:00
..
activitypub Revert "Revert "Add handler for Move activity ()"" 2019-01-10 18:46:17 +01:00
rest Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
rss Add RSS feeds for end-users () 2018-04-25 02:10:02 +02:00
web Only display web push notifications after API call (fixes ) () 2018-08-23 21:44:27 +02:00
initial_state_serializer.rb Add quick links to the admin interface in the WebUI () 2019-01-04 13:10:43 +01:00
manifest_serializer.rb implement web share target () 2018-01-17 17:08:10 +01:00
oembed_serializer.rb Clean up and improve generated OpenGraph tags () 2017-09-12 05:39:38 +02:00
webfinger_serializer.rb Add remote interaction dialog for toots () 2018-08-18 03:03:12 +02:00