fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-28 07:57:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/views/stream_entries
History
Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder
2019-06-24 15:02:59 +02:00
..
_attachment_list.html.haml Add attachment list fallback to public pages (#9780) 2019-01-13 09:23:54 +00:00
_detailed_status.html.haml Add audio uploads (#11123) 2019-06-19 23:42:38 +02:00
_og_description.html.haml Add description meta tag additionally to og:description (#8941) 2018-10-10 02:21:30 +02:00
_og_image.html.haml add og:image:alt for media attachments in embeds (#10779) 2019-05-18 20:57:45 +02:00
_poll.html.haml Add support for custom emojis in poll options (#10322) 2019-03-20 17:29:12 +01:00
_simple_status.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
_status.html.haml Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
embed.html.haml Add animate custom emoji param to embed pages (#8507) 2018-08-30 23:14:01 +02:00
show.html.haml Fix og:url on toots' public view (#9047) 2018-10-21 22:52:10 +02:00