about summary refs log tree commit diff
path: root/app/views
AgeCommit message (Collapse)Author
2018-06-12Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentionsDavid Yip
2018-06-12Merge remote-tracking branch 'glitchsoc/master' into ↵David Yip
454-allow-keyword-mutes-to-skip-mentions Conflicts: app/models/glitch/keyword_mute.rb
2018-06-12Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-06-09Merge pull request #506 from ThibG/glitch-soc/fixes/static-500David Yip
Hardcode default skin/theme in error layout (fixes #373)
2018-06-07Add "Edit profile" link to public profile page, increase bottom padding (#7754)Eugen Rochko
2018-06-07Merge remote-tracking branch 'tootsuite/master' into merge-upstreamDavid Yip
Conflicts: app/models/status.rb The conflict in the Status model was due to https://github.com/tootsuite/mastodon/commit/5bf500338478f819a65d25636a0af61a482972d3. It was resolved by accepting tootsuite's changes.
2018-06-04Remove unnecessary underline on accounts table (#7728)Yamagishi Kazutoshi
2018-06-04Add apply-to-mentions option to keyword mute UI. #454.David Yip
2018-05-31Hardcode default skin/theme in error layout (fixes #373)Thibaut Girka
This is a bit hackish. The best way would simply to somehow use Mastodon's ApplicationController with `use_pack 'error'` from the Rake task, but I'm not sure how to do that.
2018-05-21Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-05-21Display only domain of report account if remote under comment (#7574)Eugen Rochko
2018-05-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: config/locales/simple_form.ja.yml
2018-05-19Disables autocorrect/autocapitalize on remote username field. (#7549)Ash Furrow
2018-05-19In footer, replace text "Mastodon" with logo (#7545)Eugen Rochko
2018-05-18Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml
2018-05-18Add preference to hide following/followers lists (#7532)Eugen Rochko
* Add preference to hide following/followers lists - Public pages - ActivityPub collections (does not return pages but does give total) - REST API (unless it's your own) (does not federate) Fix #6901 * Add preference * Add delegation * Fix issue * Fix issue
2018-05-14Merge branch 'master' into glitch-soc/mergeThibaut Girka
2018-05-12Merge pull request #480 from ThibG/glitch-soc/fixes/glitch-soc-bio-escapeThibG
Fix glitch-style bio fields incorrect HTML escaping in public profiles
2018-05-12Fix glitch-style bio fields incorrect HTML escaping in public profilesThibaut Girka
2018-05-12Improvements to toots display in admin view (#7452)ThibG
* Distinguish boosts from original statuses in the admin panel (fixes #7449) * Show the “show more” button in admin view to make CWs clearer (fixes #7451) * Make content warnings swag
2018-05-11Merge branch 'master' into glitch-soc/mergeThibaut Girka
Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml
2018-05-10Strip tags from og:description on public tag page (#7437)Yamagishi Kazutoshi
2018-05-10Add alternate for RSS (#7436)Yamagishi Kazutoshi
2018-05-10Merge branch 'master' into glitch-soc/masterThibaut Girka
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml
2018-05-08Show media modal on public timeline (#7413)Yamagishi Kazutoshi
2018-05-07Bot nameplates (#7391)Eugen Rochko
* Store actor type in database * Add bot nameplate to web UI, add setting to preferences, API, AP Fix #7365 * Fix code style issues
2018-05-06Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-itemsbeatrix
Support upstream bio items / custom account fields
2018-05-06Enable custom emojis in profiles (notes, field values, display names) (#7374)Eugen Rochko
Follow-up to #6124
2018-05-06Add resend confirmation for admin (#7378)Shuhei Kitagawa
* Add confirmations_controller#resend * Add tests for confirmations_controller#resend * Add translations
2018-05-06Add hint about 7 day cooldown for archive takeout (#7375)Eugen Rochko
2018-05-06Add contact e-mail hint to 2FA login form (#7376)Eugen Rochko
2018-05-05Improve admin UI for accounts (#7360)Eugen Rochko
* Improve design of account statuses admin UI (consistent with reports) * Make account moderation notes look consistent with report notes * i18n-tasks remove-unused * Fix code style issues * Fix tests
2018-05-05Improve rendering of bio fields (#7353)Eugen Rochko
Fix #7335
2018-05-04Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: Gemfile.lock
2018-05-04Show remote reports in admin UI as coming from domain rather than user (#7347)Eugen Rochko
Fix #6994
2018-05-03Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml
2018-05-02Serialize webfinger XML with Ox instead of Nokogiri (#7319)Eugen Rochko
25ms -> 0.5ms
2018-04-30Fix "Show more" URL on paginated threads for remote statuses (#7285)Eugen Rochko
* Fix URL of "Show more" link in paginated threads (ancestors side) Increase item limits in threads Fix #7268 * Fix "Show more" link in paginated threads (descendants side)
2018-04-29Implement tootsuite-style account fieldsThibaut Girka
glitch-soc-style still in backup, both sharing the same SCSS style
2018-04-23Paginate descendant statuses in public page (#7148)Akihiko Odaki
2018-04-20Improve report layout (#7188)Eugen Rochko
* Use table for statuses in report * Display reported account and reporter in the same table * Split accounts and general report info into two tables again * Redesign report statuses table, notes, merge notes and action log * Remove unused translations * Fix code style issue * Fix code style issue * Fix code style issue
2018-04-20Replace preload link tag to Rails helper (#7192)Yamagishi Kazutoshi
2018-04-19Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-04-19Reports: Merge contents and comment columns (#7189)Emelia Smith
2018-04-18Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json
2018-04-17Feature: add count of account notes to reports (#7130)Emelia Smith
* Reports: Colocate account details with reports * Reports: Add count of account moderation notes Sometimes an account will be left with a note instead of the report, this adds a way to quickly see from a given report if this is the case.
2018-04-17Able to deactivate invites if they aren't expired (#7163)Jennifer Kruse
2018-04-17Fix missing "Administered by" when timeline preview disabled (#7161)Eugen Rochko
2018-04-16Remove extra spaces from search API queries and public account headers ↵ThibG
(fixes #7129) (#7152)
2018-04-14Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: db/schema.rb
generated by cgit-pink (git 2.37.1) at 2024-11-09 19:41:18 +0000