about summary refs log tree commit diff
path: root/app/views
AgeCommit message (Collapse)Author
2019-05-21Expose user settings to `Account` model and update code referencing those ↵multiple creatures
settings.
2019-05-21Moderation: add `force sensitive` and `force unlisted` actions. Accounts: ↵multiple creatures
add federatable `adult content` tag. Handle from remote accounts as well.
2019-05-21Drop remaining OStatus and PuSH code, as well as related database items.multiple creatures
2019-05-21Drop OStatus support. Fix some of the Rspec tests.multiple creatures
2019-05-21Privacy: add options to make interaction lists private and to not be ↵multiple creatures
included in public interaction lists.
2019-05-21Anxiety reduction: add option to hide mascot.multiple creatures
2019-05-21Add option to filter packmate thread branches where you don't follow all the ↵multiple creatures
participants.
2019-05-21Split boosts/repeats off to their own tab and add to the API.multiple creatures
2019-05-21Custom filters: add ability to create filters that exclude or are exclusive ↵multiple creatures
to roars with attachments.
2019-05-21Add option to hide public replies from profilemultiple creatures
2019-05-21Anxiety reduction: make block/mute reply filters more granular and add ↵multiple creatures
options to control what to filter.
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-21Add option to remove filtered roar placeholder gap.multiple creatures
2019-05-21Replace `fa-retweet` SVG with `fa-repeat` Unicode glyph.multiple creatures
2019-05-21Add options to increase size and spacing of action buttons and width of ↵multiple creatures
compose drawer.
2019-05-21Add options to increase size and spacing of context menus and to gently the ↵multiple creatures
kobolds. Also allow showing multiple user roles.
2019-05-21allow users to add emojimultiple creatures
2019-05-21add option to toggle captions + code: move monsterpit additons on topmultiple 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-21group related prefs togethermultiple creatures
2019-05-21move extended description presenter to own methodmultiple creatures
2019-05-21hidden accounts + stats hidingmultiple creatures
2019-05-21add option to show raw world timelinemultiple creatures
2019-05-21arrange widgets in a sensible ordermultiple creatures
2019-05-21more local-only optionsmultiple creatures
2019-05-21add option to default to local onlymultiple 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-17Add option for default toot content-typeThibaut Girka
2019-05-15Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-14Record account suspend/silence time and keep track of domain blocks (#10660)ThibG
* Record account suspend/silence time and keep track of domain blocks * Also unblock users who were suspended/silenced before dates were recorded * Add tests * Keep track of suspending date for users suspended through the CLI * Show accurate number of accounts that would be affected by unsuspending an instance * Change migration to set silenced_at and suspended_at * Revert "Also unblock users who were suspended/silenced before dates were recorded" This reverts commit a015c65d2d1e28c7b7cfab8b3f8cd5fb48b8b71c. * Switch from using suspended and silenced to suspended_at and silenced_at * Add post-deployment migration script to remove `suspended` and `silenced` columns * Use Account#silence! and Account#suspend! instead of updating the underlying property * Add silenced_at and suspended_at migration to post-migration * Change account fabricator to translate suspended and silenced attributes * Minor fixes * Make unblocking domains always retroactive
2019-05-11Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-11Use local time in audit log (#10751)nzws
2019-05-04Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/media_attachment.rb
2019-05-01Add site-wide options to show reblogs and replies in local/public timelinesThibaut Girka
Fixes #1021
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-04-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-04-23Fix sign up button not saying sign up when invite is used (#10623)Eugen Rochko
Fix #10616
2019-04-22Load custom CSS rules after standard onesThibaut Girka
Fixes #933 Due to glitch-soc's theming system, JS and CSS files are imported in a slightly different order, and custom CSS rules were loaded *before* everything else. They will now be loaded *after* everything else, which is a bit different from upstream but should work better overall.
2019-04-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc
2019-04-21Animate avatar GIFs on-hover on public profiles (#10549)Jessica
* Third time is the charm? * Use full asset URL for data-static and data-original ̀image_tag` expands to the full asset URL, we have to do the same in `data` attributes so that it can work when assets and user data are stored on a different host
2019-04-19Fix keybase indication on dashboardThibaut Girka
2019-04-19Allow turning keybase off instance-wideThibaut Girka
2019-04-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.
2019-04-10Change the groupings of menu items in settings navigation (#10533)Eugen Rochko
* Change the groupings of menu items in settings navigation Fix #10307 * Remove unused translations
2019-04-10Add invite request to pending account notification e-mail (#10528)Eugen Rochko
Fix sorting of the pending accounts page
2019-04-10Add preference to disable e-mails about new pending accounts (#10529)Eugen Rochko
2019-04-09Add "why do you want to join" field to invite requests (#10524)Eugen Rochko
* Add "why do you want to join" field to invite requests Fix #10512 * Remove unused translations * Fix broken registrations when no invite request text is submitted
2019-04-08Fix batch actions not working on pending accounts (#10508)ThibG