luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-11 07:55:04 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/statuses
History
Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it.
2020-12-15 14:27:06 +01:00
..
_attachment_list.html.haml
_detailed_status.html.haml Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573) 2020-12-15 12:56:43 +01:00
_og_description.html.haml
_og_image.html.haml Fix various issues around OpenGraph representation of media (#14133) 2020-06-25 01:33:01 +02:00
_poll.html.haml Fix end-user-facing uses of inline CSS (#13438) 2020-04-28 10:16:55 +02:00
_simple_status.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
_status.html.haml Change public thread view to hide "Show thread" link (#15266) 2020-12-02 21:21:44 +01:00
embed.html.haml
show.html.haml add og:published_time to opengraph meta tags (#14865) 2020-09-24 23:32:13 +02:00