about summary refs log tree commit diff
path: root/app/views/stream_entries/_detailed_status.html.haml
AgeCommit message (Collapse)Author
2017-09-09Merge tag 'v1.6.0rc3' into sync/upstreamDavid Yip
2017-09-09Merge branch 'origin/master' into sync/upstreamDavid Yip
Conflicts: app/javascript/mastodon/components/status_list.js app/javascript/mastodon/features/notifications/index.js app/javascript/mastodon/features/ui/components/modal_root.js app/javascript/mastodon/features/ui/components/onboarding_modal.js app/javascript/mastodon/features/ui/index.js app/javascript/styles/about.scss app/javascript/styles/accounts.scss app/javascript/styles/components.scss app/presenters/instance_presenter.rb app/services/post_status_service.rb app/services/reblog_service.rb app/views/about/more.html.haml app/views/about/show.html.haml app/views/accounts/_header.html.haml config/webpack/loaders/babel.js spec/controllers/api/v1/accounts/credentials_controller_spec.rb
2017-09-05Adjust status embeds (#4808)Lynx Kotoura
* Adjust status embeds Adjust styles of embed code. Adjust styles of embed pages. Fix overflow of embed-modal. * Remove trailing whitespace * Using width from the variable
2017-08-30Update status embeds (#4742)Eugen Rochko
- Use statuses controller for embeds instead of stream entries controller - Prefer /@:username/:id/embed URL for embeds - Use /@:username as author_url in OEmbed - Add follow link to embeds which opens web intent in new window - Use redis cache in development - Cache entire embed
2017-07-12Merge upstream!! #64 <3 <3kibigo!
2017-07-06Improve Activity stream spoiler (#4088)abcang
2017-06-29Images now behind CWs on static pageskibigo!
2017-06-10Improve RTL detection (#3682)Eugen Rochko
- Use plaintext - Strip out URLs - Strip out mentions - Strip out hashtags - Strip out whitespace from "overall" count - Consistent between JS and Ruby
2017-05-25Add localization of datetime in public page (#3296)Yamagishi Kazutoshi
2017-05-13Revert HTML CW changes (#3020)beatrix
* selectively Revert "Fix regressions from #2683 (#2970)" This reverts commit 72698bc3b49925a2b2955f32e5a562c1eecd729b. * Revert "Handle hashtags in spoiler_texts (partial fix for #699) (#2683)" This reverts commit e2491680e696d2c285a798ec4c66b26d2748df66.
2017-05-11Fix regressions from #2683 (#2970)Eugen Rochko
* 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
2017-05-10Handle hashtags in spoiler_texts (partial fix for #699) (#2683)R Tucker
* services: scan spoiler_text for hashtags (#699) * views: link hashtags from spoiler_texts This covers linking hashtags from within the spoiler text on the server-generated pages. * services: fix string concat going into hashtag RE Cleaner Ruby syntax, may handle immutable strings better
2017-05-08Added haml-lint and fix warnings (#2773)yhirano
* add haml_lint to Gemfile * add .haml-lint.yml * fix warnings of haml_lint
2017-05-07Remove local_time gem, and add similar (#2875)Yamagishi Kazutoshi
2017-04-22[WIP] Html lang on statuses (#2297)Matt Jankowski
* Add html lang attributes around statuses * Remove urls from language detection
2017-04-21Use local_time gem for timezone replacement (#2174)Matt Jankowski
For the 'time ago' value of stream entry simple statuses and the timestamp value of detailed statuses - output their UTC value and use the browser timezone to convert locally.
2017-04-12significant improvement in microformats markup (#1063)Ben Roberts
* significant improvement in microformats markup This is a huge improvement and I believe will close #965. Had these microformats reviewed by others in the community to help ensure they are at least correct, if not complete. I did not want to change the structure of the page, and so there it does not fully mark up the entire ancestry chain, or reply chain, only the direct decendants and direct ancestors are correctly associated, but this is likely fine as the most important bit is to have access to the urls for those toots which are now correctly fetchable. * improve code climate * trying to pass code climate tests * code climate * fix p-summary for content warning posts * fix error introduced when merging via github
2017-04-12Fix target blank on "open_in_web" link (#1612)David Libeau
When you render the "embed" view in an iframe, this link bugs when clicked, due to missing target blank.
2017-04-12Quick best practice cleanup of views/helpers (#1546)Matt Jankowski
* Remove trailing whitespace * Use query methods instead of explicit .blank? checks
2017-04-12Simplify the way the embed view is created (#1590)Matt Jankowski
* Add coverage for embedded status view * Refactor embed view to eliminate @external_links variable
2017-03-31Fix some views still not using counter cachesEugen Rochko
2017-03-31Fix #700 - hide spoilers on static pagesEugen Rochko
2017-03-04Fix #431 - convert gif to webm during upload. Web UI treats them like it didEugen Rochko
before. In the API, attachments now can be either image, video or gifv. Gifv is to be treated like images in terms of behaviour, but are videos by file type.
2017-02-28Fix #186 - Add RTL support to the compose form textarea and statuses outputEugen Rochko
2017-01-30Add "open in web" link to detailed public status pagesEugen Rochko
2017-01-25Instead of using spoiler boolean and spoiler_text, simply check for ↵Eugen Rochko
non-blank spoiler_text Federate spoiler_text using warning attribute on <content /> instead of a <category term="spoiler" /> Clean up schema file from accidental development migrations
2017-01-15Fix tests, add applications to eager loading/cache for statuses, fixEugen Rochko
application website validation, don't link to app website if website isn't set, also comment out animated boost icon from #464 until it's consistent with non-animated version
2017-01-15Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into ↵Effy Elden
feature/toot-app-source
2017-01-15Test for presence of Application in haml before trying to render details, to ↵Effy Elden
fix errors identified by CI
2017-01-15Fix typo in relEffy Elden
2017-01-15Add tracking of OAuth app that posted a status, extend OAuth apps to have ↵Effy Elden
optional website field, add application details to API, show application name and website on detailed status views. Resolves #11
2017-01-09simplify emojification on public pages with .emojify classblackle
2017-01-06Add Microformats2 markupGreg V
h-feed, h-card and h-entry
2016-12-18Adjusting public display of statuses to look similar to logged-in UI,Eugen Rochko
fix #361 with rich OEmbed display via iframe, fix #237 by hiding sensitive content behind a spoiler on public pages