499 Commits (e9106c361f9820c497450deee83e742cf44e4e21)

Author SHA1 Message Date
Yamagishi Kazutoshi c0b945b77e Fix tests for invites controller (regression from 32c3fc08fe) (#7597)
7 years ago
Shuhei Kitagawa 0a5527319a Add tests for report notes controller (#7589)
7 years ago
Thibaut Girka c384e0f3de Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 7eaa12c83a Ensure push subscription is immediately removed when application is revoked (#7548)
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
7 years ago
Shuhei Kitagawa fd0f2b675e Add tests for invites controller (#7441)
7 years ago
Eugen Rochko e86a4fe36b Add REST API for Web Push Notifications subscriptions (#7445)
7 years ago
Thibaut Girka af504e62ff Merge branch 'master' into glitch-soc/master
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
Shuhei Kitagawa 8c8a850f8a Add resend confirmation for admin (#7378)
7 years ago
Eugen Rochko 0dcca6b6e8 Improve admin UI for accounts (#7360)
7 years ago
Shuhei Kitagawa de918cee5a Add tests for admin/custom_emojis_controller (#7350)
7 years ago
David Yip c87f1d99e4 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 68ba4f23e0 Serialize webfinger XML with Ox instead of Nokogiri (#7319)
7 years ago
Akihiko Odaki e22f682df0 Paginate descendant statuses in public page (#7148)
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
Eugen Rochko 354a6e4026 Improve report layout (#7188)
7 years ago
David Yip bae5435010 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Akihiko Odaki 540d2ddfe4 Redirect to account status page for page of status stream entry (#7104)
7 years ago
David Yip 605016368d Merge pull request #419 from ThibG/glitch-soc/features/bookmarks
7 years ago
David Yip ac1ac20ee9 Merge remote-tracking branch 'tootsuite/master'
7 years ago
Alexander 8a9da4c414 update gem, test pam authentication (#7028)
7 years ago
Thibaut Girka 739f76403f Add spec for bookmark endpoints
7 years ago
Jenkins e4e0aa5d21 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith 765bfd0cf5 Feature: Allow staff to change user emails (#7074)
7 years ago
David Yip 337fc136fd Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Levi Bard 6828abc1d7 Enable updating additional account information from user preferences via rest api (#6789)
7 years ago
Jenkins 62ce70f28c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith 078aa8b5ae Improve require_admin! and require_staff! filters (#7018)
7 years ago
Emelia Smith 5373b138e8 Feature: Report improvements (#6967) (#7000)
7 years ago
Jenkins 54608d0486 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki e68459fc5b Redirect from Web tag timeline to public tag timeline if not signed in (#6633)
7 years ago
Akihiko Odaki 008bc9f47d Set the default locale in config (#6580)
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko cdb12bd39b Fix bug in relationships API introduced by #6482 (#6527)
7 years ago
Jenkins 777559fa5f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang 1f2aa77758 Fix response of signature_verification_failure_reason (#6441)
7 years ago
Jenkins 3cd4a0804b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki b5162e2aff Rename ResolveRemoteAccountService to ResolveAccountService (#6327)
7 years ago
David Yip a95ca95b7b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Aboobacker MK a1979b50c9 Redirect to 2FA creation page when otp_secret is not available (#6314)
7 years ago
David Yip d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 92df0bba59 Fix regeneration marker not expiring (#6290)
7 years ago
David Yip b1155460ba Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9cfbbbce1f Fix home regeneration (#6251)
7 years ago
David Yip 53854707ce Thank you, Officer Murphy
7 years ago
David Yip eecdc3e6a7 Add examples based on errors seen in #317
7 years ago
Jenkins 1f469edac1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko c8f0be1d6d Revert #5772 (#6221)
7 years ago
Jenkins 8704a190c0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi c89bb8ae40 Fix force_ssl conditional (#6201)
7 years ago
Jenkins 796a39a283 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel bc5487a1c2 Fix email confirmation link not updating email (#6187)
7 years ago
Jenkins a7b8cb9493 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 7a0479c830 Allow to dereference Follow object for ActivityPub (#5772)
7 years ago
David Yip a56c9ac5dc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 7f286d1af0 Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)
7 years ago
Eugen Rochko 87af0bf6cf Rate limit by user instead of IP when API user is authenticated (#5923)
7 years ago
abcang 7fc5cf7a12 Keep WebPush settings (#5879)
7 years ago
Jenkins a3a7b6a848 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
aschmitz cbaddc6447 Break out nested relationship API keys (#5887)
7 years ago
aschmitz ce341c7cf6 Allow hiding of reblogs from followed users (#5762)
7 years ago
David Yip f1279d8ff3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko e149067561 Lists (#5703)
7 years ago
David Yip 5f689cdf78 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ysksn 08cb63c360 Remove empty strings (#5732)
7 years ago
Surinna Curtis 02ae609d9a Merge tootsuite/master at ab48f2b239
7 years ago
Surinna Curtis 582dd1b7c7 Optional notification muting (#5087)
7 years ago
aschmitz 2f1fdd37d3 Per-user reblog hiding implementation/fixes/tests
7 years ago
Nanamachi e1ee50976c Rewrite account_controller_spec (#5633)
7 years ago
David Yip ebfec40698 Set up /settings/keyword_mutes. #164.
7 years ago
David Yip ec18363c3b Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 3378a3af96 Improve spec of Feed and UserTrackingConcern (#5367)
7 years ago
kibigo! 02827345ae Merge upstream 2.0ish #165
7 years ago
Akihiko Odaki 783422f8f5 Fix pagination in Api::V1::BlocksController (#5285)
7 years ago
nullkal 81489970fb Add moderation note (#5240)
7 years ago
Eugen Rochko b98cd0041b Redesign public hashtag pages (#5237)
7 years ago
utam0k 51f8cbfbeb Implement EmailBlackList (#5109)
7 years ago
Yamagishi Kazutoshi 6bd4e3bf97 Separate notifications preferences from general preferences (#4447)
7 years ago
ThibG 707cd936e8 Fix HTTP responses for salmon and ActivityPub inbox processing (#5200)
7 years ago
Eugen Rochko 0783f18274 Make Chrome splash screen same color as web UI's background color (#5169)
7 years ago
Akihiko Odaki 51f48c8960 Fix order of paginated accounts in FollowerDomainsController and spec (#3357)
7 years ago
Eugen Rochko 5983fa43f5 Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)
7 years ago
Eugen Rochko 795e624d5d Add ability to specify alternative text for media attachments (#5123)
7 years ago
Ondřej Hruška 0cc795db6b Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
7 years ago
Ondřej Hruška 914c0465b1 Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
7 years ago
Eugen Rochko f621e05356 New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)
7 years ago
aschmitz 618df7a5ee Change IDs to strings rather than numbers in API JSON output (#5019)
7 years ago
Eugen Rochko f10a687118 Fix error when following locked accounts (#4896)
7 years ago
Eugen Rochko 2d1048d041 When web UI URL used while logged out, redirect to static page (#4954)
7 years ago
Surinna Curtis 86d02930c7 Add more specs for the /api/v1/mutes/details endpoint
7 years ago
Surinna Curtis 2bd218dfdb Add a /api/v1/mutes/details route that just returns the array of mutes.
7 years ago
Surinna Curtis 1e69cc4228 API support for muting notifications (and specs)
7 years ago
Eugen Rochko e054961051 Fix error when following locked accounts (#4896)
7 years ago
Surinna Curtis 2f872fc0aa Fix a spuriously failing spec that assumed we required short bios like upstream
7 years ago
Eugen Rochko 078c84fbb5 Fix POST /api/v1/follows error when already following (#4878)
7 years ago
Eugen Rochko 6628ea4a82 Default follows for new users (#4871)
7 years ago
Eugen Rochko 181cbbcaf8 Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)
7 years ago
nullkal 36872cd22c Show pinned statuses only in the top of the profile page (#4803)
7 years ago
unarist 34603e0154 Raise an error for remote url in StatusFinder (#4776)
7 years ago
Eugen Rochko 651c659fd6 Update status embeds (#4742)
7 years ago
abcang 4fb007764b rescue HTTP::ConnectionError in RemoteFollowController#create (#4726)
7 years ago
nullkal f9ebff4b13 Allow multiple pinned statuses to be shown and make them be ordered b… (#4690)
7 years ago
Eugen Rochko 3e20cb7025 Pinned statuses (#4675)
7 years ago
unarist bab7127ac9 Fetch reblogs as Announce activity instead of Note object (#4672)
7 years ago
Eugen Rochko d44b84bebd Minor performance improvement for test suite (#4678)
7 years ago
nullkal da85aff49c Use checkboxes for application scope setting (#4671)
7 years ago
Eugen Rochko b13501268f Fix up the applications area (#4664)
7 years ago
Colin Mitchell 63b98318c5 Application prefs section (#2758)
7 years ago
Eugen Rochko 39b76d47a5 Fix #4637 - Re-add missing doorkeeper_authorize for /api/v1/verify_credentials (#4650)
7 years ago
Yamagishi Kazutoshi c0642a0042 Don't send Link header when don't know prev and next links (#4633)
7 years ago
Eugen Rochko 1c7cbbcb8c Set correct content-type for ActivityPub JSON (#4592)
7 years ago
Eugen Rochko 3473aac8d8 Hook up URL-based resource look-up to ActivityPub (#4589)
7 years ago
Eugen Rochko 34962d9f9d Add alternate links to ActivityPub resources from HTML/HEAD variants (#4586)
7 years ago
Eugen Rochko 5516767c75 ActivityPub delivery (#4566)
7 years ago
Eugen Rochko 1b6ced5887 Add Digest header to requests with body, handle acct and URI keyId (#4565)
7 years ago
Eugen Rochko f18739fd60 Add ActivityPub inbox (#4216)
7 years ago
Eugen Rochko fd69694749 Add "signed in as" header to some pages (#4523)
7 years ago
nullkal 62b92a4c0a Redirect to PasswordController#new when reset_password_token is invalid (#4506)
7 years ago
Akihiko Odaki ebb58bc36e Cover Api::V1:FavouritesController more (#4409)
7 years ago
Akihiko Odaki 7843855f7f Introduce access token fabricators (#4401)
7 years ago
Akihiko Odaki e39c922727 Remove redundant fabrication in the spec for Api::V1::FavouritesController (#4391)
7 years ago
Sorin Davidoi 78ff8d3421 feat: Enable push subscription for mobile devices by default (#4321)
7 years ago
Eugen Rochko 75ab767791 Fix webfinger retries (#4275)
7 years ago
abcang e3251e74c1 Improve admin page (#4121)
7 years ago
Eugen Rochko c99f41dc3c Improve ActivityPub representations (#3844)
7 years ago
Eugen Rochko c6e46f7421 Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)
7 years ago
Eugen Rochko c5fa4aba91 HTTP signatures (#4146)
7 years ago
Sorin Davidoi ecab38fd66 Web Push Notifications (#3243)
7 years ago
Eugen Rochko 8abeec1f4f Improve UI of admin site settings (#4163)
7 years ago
STJrInuyasha 098eef3211 Remote following success page (#4129)
7 years ago
Eugen Rochko 0d54e620d9 Replace OEmbed and initial state Rabl templates with serializers (#4110)
7 years ago
Matt Jankowski eb39fb7211 Add controller spec for manifests controller (#4003)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 4be3cf318d Cover Admin::AccountsController more (#3327)
7 years ago
Eugen Rochko d0221b05bc Fix #1624 - Send e-mail notifications to admins about new reports (#3949)
7 years ago
Eugen Rochko b90a44b6d0 Fix #3910 - Require OTP authentication to disable 2FA (#3935)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 4ca14209d1 Cover Auth::RegistrationsController more (#3353)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 071c6f392e Cover Admin::DomainBlocksController more (#3329)
7 years ago
masarakki d947978192 setting-for-account-deletable (#3852)
8 years ago
Eugen Rochko 8bed91d94c Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847)
8 years ago
Eugen Rochko c883e96d95 Fix account delete form not accepting password, update suspended (#3745)
8 years ago
Eugen Rochko 1c7e2ddd65 Account deletion (#3728)
8 years ago
unarist 1ce6a20bde Fix locale related specs (#3707)
8 years ago
René Klačan ecdf17a2d7 Make sure email is case insensitive on all places (#3688)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) a5729feb11 Improve default language decision and spec (#3351)
8 years ago
Matt Jankowski e31cd944c2 Move create/destroy actions for api/v1/statuses to namespace (#3678)
8 years ago
Matt Jankowski dc717cf425 Move reblogged_by and favourited_by actions out of api/v1/statuses and into unique controllers (#3646)
8 years ago
Matt Jankowski 76f986d07b Clean up for api/base controller (#3629)
8 years ago
unarist c40e5aea44 Use "match_array" only for order independent assertions (#3626)
8 years ago
Matt Jankowski 9a43a1051a Coverage improvement and concern extraction for rate limit headers in API controller (#3625)
8 years ago
Daigo 3 Dango e1142e190b Redirect to streaming_api_base_url (#3579)
8 years ago
Yamagishi Kazutoshi 9df077e370 Fix spec for #2388 (#3526)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 2c511bbad4 Spec response for forgery (#3248)
8 years ago
Matt Jankowski 1066fd1ab5 Spec coverage and refactor for the api/v1/accounts controllers (#3451)
8 years ago
Matt Jankowski 81ce4e4318 Move admin/pubsubhubbub controller to admin/subscriptions (#3442)
8 years ago
Matt Jankowski 0985a9ff7d Improve spec coverage and clean up api/v1/blocks controller (#3464)
8 years ago
Matt Jankowski ae721f376a Improve spec coverage and clean up api/v1/follow_requests controller (#3465)
8 years ago
Matt Jankowski e32b9ecbf6 Improve spec coverage and clean up api/v1/domain_blocks controller (#3466)
8 years ago
Matt Jankowski 6237abaaa3 Improve spec coverage and clean up api/v1/favourites controller (#3472)
8 years ago
Matt Jankowski 3e95a6c9b7 Improve spec coverage and clean up api/v1/mutes controller (#3481)
8 years ago
Yamagishi Kazutoshi b652c52992 Keep ENV['LOCAL_HTTPS'] with ApplicationControllerSpec (fix random fail) (#3479)
8 years ago
Matt Jankowski 8b69d8d46d Improve spec coverage and clean up api/v1/media controller (#3467)
8 years ago
Matt Jankowski 5a54a5ba69 Clean up api/subscriptions controller (#3448)
8 years ago
Matt Jankowski 4e89226243 Improve api oembed controller (#3450)
8 years ago
Matt Jankowski 0ee8f559ec Clean up api/salmon controller (#3449)
8 years ago
Matt Jankowski 18c81c74e5 Remove exports/base controller in favor of shared concern (#3444)
8 years ago
Akihiko Odaki 6f064d0e65 Use around hook to restore context in Admin::SettingsController spec (#3428)
8 years ago
Jack Jennings faf53a5a3e Extract authorization policy for viewing statuses (#3150)
8 years ago
Akihiko Odaki ff2bfea0b3 Remove methods from ObfuscateFilename and spec (#3347)
8 years ago
Akihiko Odaki 587f2d0b1f Spec Auth::ConfirmationsController (#3348)
8 years ago
Akihiko Odaki a111604729 Spec AccountControllerConcern (#3349)
8 years ago
Akihiko Odaki e41d7875d7 Cover Admin::ReportsController more (#3346)
8 years ago
Akihiko Odaki 9481b20b23 Cover InstancesController more (#3342)
8 years ago
Akihiko Odaki 46a60e19ef Cover Admin::SuspensionsController more (#3350)
8 years ago
Akihiko Odaki 503298d89b Spec Auth::PasswordsController (#3352)
8 years ago
Akihiko Odaki 1cb145578b Spec Admin::ResetsController calls send_reset_password_instructions (#3354)
8 years ago
Akihiko Odaki 2b299efbbc Spec #destroy feature of Admin::TwoFactorAuthenticationsController (#3355)
8 years ago
Akihiko Odaki 07c90d0b0d Coever Admin::SilencesController more (#3356)
8 years ago
Akihiko Odaki e48d2dfd87 Cover Settings::ExportsController more (#3358)
8 years ago
Akihiko Odaki 43722d1add Cover Oauth::AuthorizedApplicationsController (#3359)
8 years ago
Akihiko Odaki cdcb550ce9 Cover Oauth::AuthorizationsController more (#3361)
8 years ago
Akihiko Odaki 013825b7b0 Cover Settings::TwoFactorAuthenticationsController more (#3376)
8 years ago
Akihiko Odaki bbaa9dda56 Cover WellKnown::HostMetaController more (#3382)
8 years ago
Akihiko Odaki bb41a6ad80 Cover Settings::TwoFactorAuthentication::RecoveryCodesController more (#3383)
8 years ago
Akihiko Odaki f868fcb154 Spec Settings::Exports (#3384)
8 years ago
Akihiko Odaki 7300379c81 Cover WellKnown::WebfingerController more (#3385)
8 years ago
Akihiko Odaki 820e97af27 Cover Settings::TwoFactorAuthentication::ConfirmationsController more (#3386)
8 years ago
Akihiko Odaki 437ef29afd Cover Admin::PubSubHubHubController more (#3343)
8 years ago
Atsushi Yamamoto 4547e3585a Add preference setting for delete toot modal (#3368)
8 years ago
Akinori MUSHA 8a5d3b2e5d Go to root after login in single user mode (#3289)
8 years ago
Akihiko Odaki 5d9513aaea Spec Admin::BaseController (#3328)
8 years ago
Akihiko Odaki 9efb491366 Cover TagsController more (#3306)
8 years ago
Akihiko Odaki 6af012aae4 Cover HomeController more (#3258)
8 years ago
Eugen Rochko b886ecea5c Fix Devise destroy method being available to delete user record (#3266)
8 years ago
alpaca-tc 46ca699d72 Toggle sensitive from admin page (#3261)
8 years ago