about summary refs log tree commit diff
path: root/app/views/stream_entries
AgeCommit message (Collapse)Author
2019-08-15handle interactions on sharekeyed posts when both participants are local; ↵multiple creatures
allow faving sharekeyed posts
2019-08-10fix interaction buttons on public pagesmultiple creatures
2019-05-21Expose user settings to `Account` model and update code referencing those ↵multiple creatures
settings.
2019-05-21Drop OStatus support. Fix some of the Rspec tests.multiple creatures
2019-05-21Implement share keys and related bangtags, add `sharekey`, `network`, and ↵multiple creatures
`curated` to the API, remove app info from the UI, and move timestamps to the right.
2019-05-21Replace `fa-retweet` SVG with `fa-repeat` Unicode glyph.multiple creatures
2019-05-21also put hide stats on public pages under mouseovermultiple creatures
2019-05-21make hide stats option hide all public page statsmultiple creatures
2019-05-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-18add og:image:alt for media attachments in embeds (#10779)Ben Lubar
2019-05-04Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/media_attachment.rb
2019-04-27Add blurhash (#10630)Eugen Rochko
* Add blurhash * Use fallback color for spoiler when blurhash missing * Federate the blurhash and accept it as long as it's at most 5x5 * Display unknown media attachments as blurhash placeholders * Improve style of embed actions and spoiler button * Change blurhash resolution from 3x3 to 4x4 * Improve dependency definitions * Fix code style issues
2019-03-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml
2019-03-28Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401)Eugen Rochko
Also, fix some n+1 queries Resolve #10365
2019-03-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-20Add support for custom emojis in poll options (#10322)ThibG
* Backend changes for custom emoji support in poll options * Serialize poll emojis in REST API * Render custom emojis in poll options * Render custom emoji in poll options on public pages
2019-03-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-07Immediately display poll results to poll author (#10187)Eugen Rochko
* Immediately display poll results to poll author * Refactor Poll#loaded_options and add Poll#voted? to improve DRYness
2019-03-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-07Fix #10202 (#10203)rinsuki
2019-03-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.
2019-03-05Fix various issues in polls (#10165)Eugen Rochko
* Fix ActivityPub poll results being serialized even with hide_totals * Fix poll refresh button having a different font size * Display poll in OpenGraph description * Fix NoMethodError when serializing votes Regression from #10158 * Fix polls on public pages being broken for non-logged-in users * Do not show time remaining if poll has no expiration date
2019-03-04Add non-JS fallback for polls on public pages (#10155)ThibG
2019-03-03Add polls (#10111)Eugen Rochko
* Add polls Fix #1629 * Add tests * Fixes * Change API for creating polls * Use name instead of content for votes * Remove poll validation for remote polls * Add polls to public pages * When updating the poll, update options just in case they were changed * Fix public pages showing both poll and other media
2019-02-02Make displaying application used to toot opt-in (#9897)ThibG
* Make storing and displaying application used to toot opt-in * Revert to storing application info, and display it to the author via API
2019-01-27Make storing and displaying application used to toot opt-inThibaut Girka
2019-01-14Display a double reply arrow on public pages for toots that are replies (#9808)ThibG
2019-01-13Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-01-13Add attachment list fallback to public pages (#9780)ThibG
* Add attachment list fallback to public pages Fixes #6714 * Refactor attachments lists
2019-01-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-07Change remote interaction dialog to use specific actions (#9743)Eugen Rochko
* Change remote interaction dialog to use specific actions Instead of just "interact", use different strings based on whether it's a reply, reblog or favourite. Add explanation why the step is necessary in the first place * Remove obsolete strings
2019-01-04Add preview cards to non-detailed statuses on public pages (#9714)Eugen Rochko
2018-11-30Display a double reply arrow on public pages for toots that are repliesThibaut Girka
2018-10-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.
2018-10-24Fix RTL layout of status display names (#9075)Eugen Rochko
Fix #2350
2018-10-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.
2018-10-21Fix og:url on toots' public view (#9047)ThibG
Fixes #9045
2018-10-17Improve support for aspects/circles (#8950)Eugen Rochko
* Add silent column to mentions * Save silent mentions in ActivityPub Create handler and optimize it Move networking calls out of the database transaction * Add "limited" visibility level masked as "private" in the API Unlike DMs, limited statuses are pushed into home feeds. The access control rules between direct and limited statuses is almost the same, except for counter and conversation logic * Ensure silent column is non-null, add spec * Ensure filters don't check silent mentions for blocks/mutes As those are "this person is also allowed to see" rather than "this person is involved", therefore does not warrant filtering * Clean up code * Use Status#active_mentions to limit returned mentions * Fix code style issues * Use Status#active_mentions in Notification And remove stream_entry eager-loading from Notification
2018-10-12Fix microformats on statuses according to updated spec (#8958)Eugen Rochko
2018-10-11Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into ↵Thibaut Girka
glitch-soc/merge-upstream
2018-10-10Add description meta tag additionally to og:description (#8941)Eugen Rochko
Fix #8685
2018-10-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb
2018-09-28Revert Font Awesome 5 upgrade (#8810)Eugen Rochko
* Revert "Fix some icon names changed by the Font Awesome 5. (#8796)" This reverts commit 3f9ec3de82c1a3879a2b092672f51c1caca76f5c. * Revert "Migrate to font-awesome 5.0. (#8799)" This reverts commit 8bae14591bfb4fc9dd9d89d8082ac0123b03edaa. * Revert "Fix some icons names, unavailable in fontawesome5 (free license). (#8792)" This reverts commit b9c727a945fea5afffb3e3a53279164adfc6e88f. * Revert "Update the icon name changed by the Font Awesome 5. (#8776)" This reverts commit 17af4d27da484fc35ecd4b4dce2443d24aa35d23. * Revert "Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484)" This reverts commit 4b794e134d427dbc716606324adb9a885a74abec.
2018-09-27Migrate to font-awesome 5.0. (#8799)Naoki Kosaka
2018-09-25Add a new preference to always hide all media (#8569)ふぁぼ原
2018-09-24Add user preference to always expand toots marked with content warnings (#8762)Matt Sweetman
2018-09-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-09-01Fix static URL when disable autoplay (#8548)Yamagishi Kazutoshi
2018-08-31Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/views/stream_entries/_simple_status.html.haml - config/locales/nl.yml Deleted unused translation strings (themes) and adapted minor changes to _simple_status.html.haml
2018-08-31Fix autoplay issue with spoiler tag (#8540)Renato "Lond" Cerqueira
Add tests to avoid similar issues in the future