]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6502765) | patch
Fix regressions from #2683 (#2970)
authorEugen Rochko <eugen@zeonfederated.com>
Wed, 10 May 2017 22:28:10 +0000 (00:28 +0200)
committerGitHub <noreply@github.com>
Wed, 10 May 2017 22:28:10 +0000 (00:28 +0200)
commit72698bc3b49925a2b2955f32e5a562c1eecd729b
tree747cf619113cc7377a4e48eaf504892b45a2696ftree | snapshot
parent65027657ec5595131bfd82fce1458c9e2cd1afc6commit | diff
Fix regressions from #2683 (#2970)

* Fix regressions from #2683

Properly format spoiler text HTML, while keeping old logic for blankness intact
Process hashtags and mentions in spoiler text
Format spoiler text for Atom
Change "show more" toggle into a button instead of anchor
Fix style regression on dropdowns for detailed statuses

* Fix lint issue

* Convert spoiler text to plaintext in desktop notifications
14 files changed:
app/javascript/mastodon/actions/notifications.js diff | blob | history
app/javascript/mastodon/components/status_action_bar.js diff | blob | history
app/javascript/mastodon/components/status_content.js diff | blob | history
app/javascript/mastodon/features/status/components/action_bar.js diff | blob | history
app/javascript/packs/public.js diff | blob | history
app/javascript/styles/components.scss diff | blob | history
app/lib/atom_serializer.rb diff | blob | history
app/lib/formatter.rb diff | blob | history
app/services/process_hashtags_service.rb diff | blob | history
app/services/process_mentions_service.rb diff | blob | history
app/views/api/v1/statuses/_show.rabl diff | blob | history
app/views/stream_entries/_detailed_status.html.haml diff | blob | history
app/views/stream_entries/_simple_status.html.haml diff | blob | history
spec/lib/formatter_spec.rb diff | blob | history
source code fur Kibicat Mastodon