913 Commits (72c454e2b3db6732138e903e541b2f2f3180fa8f)

Author	SHA1	Message	Date
Thibaut Girka	c384e0f3de	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/simple_form.ja.yml	7 years ago
Eugen Rochko	7eaa12c83a	Ensure push subscription is immediately removed when application is revoked (#7548) ... * Ensure push subscription is immediately removed when application is revoked * When token is revoked from app, unsubscribe too	7 years ago
David Yip	3c3e6d0e9b	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	1de7400dfc	Resolve unknown status from Add activity, skip Remove if unknown (#7526) ... Fix #7518	7 years ago
Jenkins	c91bd06fa5	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Shuhei Kitagawa	6800e195a4	Add tests for account_moderation_notes_controller (#7524)	7 years ago
Thibaut Girka	d0b753db6b	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
Shuhei Kitagawa	fd0f2b675e	Add tests for invites controller (#7441) ... * Add tests for invites controller * Small refactoring and fix for invites controller	7 years ago
Eugen Rochko	e86a4fe36b	Add REST API for Web Push Notifications subscriptions (#7445) ... - POST /api/v1/push/subscription - PUT /api/v1/push/subscription - DELETE /api/v1/push/subscription - New OAuth scope: "push" (required for the above methods)	7 years ago
Thibaut Girka	af504e62ff	Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	7 years ago
Yamagishi Kazutoshi	e60292c616	Disable simplecov on CircleCI (#7416) ... * Disable simplecov on CircleCI * Remove --format progress	7 years ago
Shuhei Kitagawa	fcac2f1b60	Add tests for admin/roles_controller (#7421)	7 years ago
Shuhei Kitagawa	db644968ce	Add tests for admin/invites_controller (#7412)	7 years ago
Surinna Curtis	a2b84b644b	Take the first recognized actor_type. (#7410)	7 years ago
Shuhei Kitagawa	8c8a850f8a	Add resend confirmation for admin (#7378) ... * Add confirmations_controller#resend * Add tests for confirmations_controller#resend * Add translations	7 years ago
Yamagishi Kazutoshi	9d64bcdac7	Port travis_retry for CI (#7379) ... * Port travis_retry for CI * Add license	7 years ago
Eugen Rochko	0dcca6b6e8	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
Shuhei Kitagawa	de918cee5a	Add tests for admin/custom_emojis_controller (#7350)	7 years ago
Eugen Rochko	8913ccb434	Store home feeds for 7 days instead of 14 (#7354) ... * Store home feeds for 7 days instead of 14 Reduces workload for status fan-out to active followers * Fix test for user model	7 years ago
David Yip	087c79669a	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb db/schema.rb	7 years ago
Eugen Rochko	154076e8e7	Store URIs of follows, follow requests and blocks for ActivityPub (#7160) ... Same URI passed between follow request and follow, since they are the same thing in ActivityPub. Local URIs are generated during creation using UUIDs and are passed to serializers.	7 years ago
David Yip	c87f1d99e4	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
Shuhei Kitagawa	995d9e8485	Add missing tests for report.rb (#7324)	7 years ago
Eugen Rochko	68ba4f23e0	Serialize webfinger XML with Ox instead of Nokogiri (#7319) ... 25ms -> 0.5ms	7 years ago
Eugen Rochko	ca1c696dbd	Slightly reduce RAM usage (#7301) ... * No need to re-require sidekiq plugins, they are required via Gemfile * Add derailed_benchmarks tool, no need to require TTY gems in Gemfile * Replace ruby-oembed with FetchOEmbedService Reduce startup by 45382 allocated objects * Remove preloaded JSON-LD in favour of caching HTTP responses Reduce boot RAM by about 6 MiB * Fix tests * Fix test suite by stubbing out JSON-LD contexts	7 years ago
abcang	fcfc44de66	Keep notification when muting_notifications is true (#7311) ... * Keep notification when muting_notifications is true * Retrun mute object * Fix test	7 years ago
Eugen Rochko	d6a2530d73	Speed up test suite by not generating RSA keys in test environment (#7296) ... One RSA keypair for all fabricated test accounts is enough	7 years ago
Shuhei Kitagawa	a110cce92b	Add missing tests for user.rb (#7306)	7 years ago
Surinna Curtis	72793b3fc7	Support Actors/Statuses with multiple types (#7305) ... * Add equals_or_includes_any? helper in JsonLdHelper * Support arrays in JSON-LD type fields for actors/tags/objects. * Spec for resolving accounts with extension types * Style tweaks for codeclimate	7 years ago
David Yip	e484bd61e0	Also treat non-whole-word mutes as case-insensitive. #450.	7 years ago
MIYAGI Hikaru	50e673409f	Append '.test' to hostname in stub data (#7260)	7 years ago
Emelia Smith	1071ecfebc	Prevent suspended accounts from appearing in AccountSearchService (#7246)	7 years ago
Akihiko Odaki	e22f682df0	Paginate descendant statuses in public page (#7148)	7 years ago
Eugen Rochko	599aa39aca	Remove "nsfw" category for sensitive statuses in OStatus serializer (#7048) ... Fix #7011	7 years ago
Yamagishi Kazutoshi	32b71c8a25	Fix randomly fail (similar #7219) (#7225)	7 years ago
Yamagishi Kazutoshi	3637c4983b	Reset locale on registration tests (#7219)	7 years ago
Yamagishi Kazutoshi	7da649efb4	Use raw status code on have_http_status (#7214)	7 years ago
Yamagishi Kazutoshi	0d4342e146	Introduce rspec-retry (#7206)	7 years ago
Eugen Rochko	354a6e4026	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
David Yip	bae5435010	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
Kaito Sinclaire	447741e456	Direct messages column (#4514) ... * Added a timeline for Direct statuses * Lists all Direct statuses you've sent and received * Displayed in Getting Started * Streaming server support for direct TL * Changes to match other timelines in 2.0	7 years ago
Akihiko Odaki	540d2ddfe4	Redirect to account status page for page of status stream entry (#7104) ... Commit 6c2344d4dd missed a change for stream entry page. Instead of duplicating the change, redirect to account status page. It would also help crawlers (of search engines, for example) to understand a stream entry URL and its corresponding status URL points to the same page.	7 years ago
David Yip	9697c6d9f0	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: db/schema.rb	7 years ago
Eugen Rochko	466442b764	Add bio fields (#6645) ... * Add bio fields - Fix #3211 - Fix #232 - Fix #121 * Display bio fields in web UI * Fix output of links and missing fields * Federate bio fields over ActivityPub as PropertyValue * Improve how the fields are stored, add to Edit profile form * Add rel=me to links in fields Fix #121	7 years ago
Jenkins	a1894cbc13	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
David Yip	605016368d	Merge pull request #419 from ThibG/glitch-soc/features/bookmarks ... Bookmarks	7 years ago
Renato "Lond" Cerqueira	a4732040f0	Allow more than the max pins if account is not local (#7105) ... Sidekiq sometimes throws errors for users that have more pinned items than the allowed by the local instance. It should only validate the number of pins for local accounts.	7 years ago
David Yip	ac1ac20ee9	Merge remote-tracking branch 'tootsuite/master' ... Conflicts: app/controllers/statuses_controller.rb	7 years ago
Alexander	8a9da4c414	update gem, test pam authentication (#7028) ... * update gem, test pam authentication * add description for test parameters * fix inclusion of optional group	7 years ago
Thibaut Girka	739f76403f	Add spec for bookmark endpoints	7 years ago