916 Commits (c2e528916cae422baee3d72a3b4409a23c476b3f)

Author	SHA1	Message	Date
Thibaut Girka	e0ef89c73f	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Yamagishi Kazutoshi	6d99a0b652	Fix tests for invites controller (regression from 4d81809f36) (#7597)	7 years ago
Shuhei Kitagawa	12e590edd7	Add tests for report notes controller (#7589)	7 years ago
Thibaut Girka	b481e4fac1	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/simple_form.ja.yml	7 years ago
Eugen Rochko	8378b72eba	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	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	57b503d4ef	Resolve unknown status from Add activity, skip Remove if unknown (#7526) ... Fix #7518	7 years ago
Jenkins	2636a23092	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Shuhei Kitagawa	b48a166c82	Add tests for account_moderation_notes_controller (#7524)	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
Shuhei Kitagawa	50491e0d92	Add tests for invites controller (#7441) ... * Add tests for invites controller * Small refactoring and fix for invites controller	7 years ago
Eugen Rochko	b4fb766b23	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	1c9c0167b7	Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	7 years ago
Yamagishi Kazutoshi	ac788ad47e	Disable simplecov on CircleCI (#7416) ... * Disable simplecov on CircleCI * Remove --format progress	7 years ago
Shuhei Kitagawa	ce35d81db7	Add tests for admin/roles_controller (#7421)	7 years ago
Shuhei Kitagawa	35eff337d5	Add tests for admin/invites_controller (#7412)	7 years ago
Surinna Curtis	01dfd6dbc8	Take the first recognized actor_type. (#7410)	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
Yamagishi Kazutoshi	8c35d163a5	Port travis_retry for CI (#7379) ... * Port travis_retry for CI * Add license	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
Shuhei Kitagawa	661f7e6d9d	Add tests for admin/custom_emojis_controller (#7350)	7 years ago
Eugen Rochko	c73ce7b695	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	7600067a30	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	6793bec4c6	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	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
Shuhei Kitagawa	28b366d065	Add missing tests for report.rb (#7324)	7 years ago
Eugen Rochko	28bd4b9800	Serialize webfinger XML with Ox instead of Nokogiri (#7319) ... 25ms -> 0.5ms	7 years ago
Eugen Rochko	cb5b5cb5f7	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	71a7cea73f	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	c5dcd7d836	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	6c40e567aa	Add missing tests for user.rb (#7306)	7 years ago
Surinna Curtis	dc786c0cf4	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	5f8f481425	Also treat non-whole-word mutes as case-insensitive. #450.	7 years ago
MIYAGI Hikaru	eb593a5a0c	Append '.test' to hostname in stub data (#7260)	7 years ago
Emelia Smith	495303d9b8	Prevent suspended accounts from appearing in AccountSearchService (#7246)	7 years ago
Akihiko Odaki	1258efa882	Paginate descendant statuses in public page (#7148)	7 years ago
Eugen Rochko	75c4ab9d12	Remove "nsfw" category for sensitive statuses in OStatus serializer (#7048) ... Fix #7011	7 years ago
Yamagishi Kazutoshi	648d645c2f	Fix randomly fail (similar #7219) (#7225)	7 years ago
Yamagishi Kazutoshi	3f6893c641	Reset locale on registration tests (#7219)	7 years ago
Yamagishi Kazutoshi	d10447c3a8	Use raw status code on have_http_status (#7214)	7 years ago
Yamagishi Kazutoshi	b438224751	Introduce rspec-retry (#7206)	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
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
Kaito Sinclaire	156b916caf	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	a1049e9380	Redirect to account status page for page of status stream entry (#7104) ... Commit 519119f657 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	813da6788e	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: db/schema.rb	7 years ago
Eugen Rochko	78ed4ab75f	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	e3d0d72b29	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
David Yip	b7804028c2	Merge pull request #419 from ThibG/glitch-soc/features/bookmarks ... Bookmarks	7 years ago
Renato "Lond" Cerqueira	14d86eb0d0	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