859 Commits (26c20a4ec7868753b284670575f28f201a5cef9f)

Author	SHA1	Message	Date
Thibaut Girka	db200226b8	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…	7 years ago
Eugen Rochko	ca85658975	Add autofollow option to invites (#7805) ... * Add autofollow option to invites * Trigger CodeClimate rebuild	7 years ago
David Yip	5cff053944	Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions	7 years ago
David Yip	e931cf656d	Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions ... Conflicts: app/models/glitch/keyword_mute.rb	7 years ago
Jenkins	4d8d1fa129	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
David Yip	f9eb4ea80a	Merge pull request #506 from ThibG/glitch-soc/fixes/static-500 ... Hardcode default skin/theme in error layout (fixes #373)	7 years ago
Eugen Rochko	9b9e96eae5	Add "Edit profile" link to public profile page, increase bottom padding (#7754)	7 years ago
David Yip	8142bd2553	Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/models/status.rb The conflict in the Status model was due to 5bf5003384. It was resolved by accepting tootsuite's changes.	7 years ago
Yamagishi Kazutoshi	c0fc4e9935	Remove unnecessary underline on accounts table (#7728)	7 years ago
David Yip	97d2df77aa	Add apply-to-mentions option to keyword mute UI. #454.	7 years ago
Thibaut Girka	e8a9627f66	Hardcode default skin/theme in error layout (fixes #373) ... 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.	7 years ago
Jenkins	f93806ea55	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	40ef46dbef	Display only domain of report account if remote under comment (#7574)	7 years ago
Thibaut Girka	b481e4fac1	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/simple_form.ja.yml	7 years ago
Ash Furrow	50db106252	Disables autocorrect/autocapitalize on remote username field. (#7549)	7 years ago
Eugen Rochko	93c66f0c03	In footer, replace text "Mastodon" with logo (#7545)	7 years ago
David Yip	e0eebba461	Merge remote-tracking branch 'origin/master' into merge-upstream ... 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	7 years ago
Eugen Rochko	1e02dc8715	Add preference to hide following/followers lists (#7532) ... * 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	7 years ago
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	7 years ago
ThibG	685cf5599f	Merge pull request #480 from ThibG/glitch-soc/fixes/glitch-soc-bio-escape ... Fix glitch-style bio fields incorrect HTML escaping in public profiles	7 years ago
Thibaut Girka	cc8d81519e	Fix glitch-style bio fields incorrect HTML escaping in public profiles	7 years ago
ThibG	0f2fbf7d05	Improvements to toots display in admin view (#7452) ... * 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	7 years ago
Thibaut Girka	45fce0e496	Merge branch 'master' into glitch-soc/merge ... Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml	7 years ago
Yamagishi Kazutoshi	bd5f57cbc3	Strip tags from og:description on public tag page (#7437)	7 years ago
Yamagishi Kazutoshi	0a7e8320b2	Add alternate for RSS (#7436)	7 years ago
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	7 years ago
Yamagishi Kazutoshi	e0b1e17bd0	Show media modal on public timeline (#7413)	7 years ago
Eugen Rochko	42cd363542	Bot nameplates (#7391) ... * Store actor type in database * Add bot nameplate to web UI, add setting to preferences, API, AP Fix #7365 * Fix code style issues	7 years ago
beatrix	35a1a3171f	Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-items ... Support upstream bio items / custom account fields	7 years ago
Eugen Rochko	61a9018607	Enable custom emojis in profiles (notes, field values, display names) (#7374) ... Follow-up to #6124	7 years ago
Shuhei Kitagawa	bd10a7e480	Add resend confirmation for admin (#7378) ... * Add confirmations_controller#resend * Add tests for confirmations_controller#resend * Add translations	7 years ago
Eugen Rochko	39efc6d533	Add hint about 7 day cooldown for archive takeout (#7375)	7 years ago
Eugen Rochko	b611dbac79	Add contact e-mail hint to 2FA login form (#7376)	7 years ago
Eugen Rochko	c7d1a2e400	Improve admin UI for accounts (#7360) ... * 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	7 years ago
Eugen Rochko	2ef9d65052	Improve rendering of bio fields (#7353) ... Fix #7335	7 years ago
David Yip	77a92d3260	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: Gemfile.lock	7 years ago
Eugen Rochko	251bbf9728	Show remote reports in admin UI as coming from domain rather than user (#7347) ... Fix #6994	7 years ago
David Yip	c816701550	Merge remote-tracking branch 'origin/master' into gs-master ... 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	7 years ago
Eugen Rochko	28bd4b9800	Serialize webfinger XML with Ox instead of Nokogiri (#7319) ... 25ms -> 0.5ms	7 years ago
Eugen Rochko	da61352fab	Fix "Show more" URL on paginated threads for remote statuses (#7285) ... * 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)	7 years ago
Thibaut Girka	356d0214c9	Implement tootsuite-style account fields ... glitch-soc-style still in backup, both sharing the same SCSS style	7 years ago
Akihiko Odaki	1258efa882	Paginate descendant statuses in public page (#7148)	7 years ago
Eugen Rochko	a9c440637c	Improve report layout (#7188) ... * 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	7 years ago
Yamagishi Kazutoshi	1663368724	Replace preload link tag to Rails helper (#7192)	7 years ago
Jenkins	ed17e173d6	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Emelia Smith	b9c35785e2	Reports: Merge contents and comment columns (#7189)	7 years ago
David Yip	16d5217502	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json	7 years ago
Emelia Smith	204d72fbe4	Feature: add count of account notes to reports (#7130) ... * 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.	7 years ago
Jennifer Kruse	ef12a2b74c	Able to deactivate invites if they aren't expired (#7163)	7 years ago
Eugen Rochko	07a7d5959c	Fix missing "Administered by" when timeline preview disabled (#7161)	7 years ago