405 Commits (ee1f1a2ec97604ed364a5944bd300be0771ba7d7)

Author SHA1 Message Date
David Yip 1253279feb
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Aboobacker MK 112b1fa265 Redirect to 2FA creation page when otp_secret is not available (#6314)
7 years ago
David Yip 2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9b3b40df66
Fix regeneration marker not expiring (#6290)
7 years ago
David Yip 201e82686f
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 7badad7797
Fix home regeneration (#6251)
7 years ago
David Yip 395e64e858
Thank you, Officer Murphy
7 years ago
David Yip 3ce1385b25
Add examples based on errors seen in #317
7 years ago
Jenkins f839ac694c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko dbda87c31f
Revert #5772 (#6221)
7 years ago
Jenkins c2e1bfd9ae Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 1d92b90be9 Fix force_ssl conditional (#6201)
7 years ago
Jenkins c69a23ae46 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 5ec25ff3e1 Fix email confirmation link not updating email (#6187)
7 years ago
Jenkins fc884d015a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 161c72d66d Allow to dereference Follow object for ActivityPub (#5772)
7 years ago
David Yip a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 1356ed72cd
Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)
7 years ago
Eugen Rochko a865b62efc
Rate limit by user instead of IP when API user is authenticated (#5923)
7 years ago
abcang 99242b92bc Keep WebPush settings (#5879)
7 years ago
Jenkins 8ca91cef45 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
aschmitz 4de211b80a Break out nested relationship API keys (#5887)
7 years ago
aschmitz eeaec39888 Allow hiding of reblogs from followed users (#5762)
7 years ago
David Yip 1ab12ba38e Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 24cafd73a2
Lists (#5703)
7 years ago
David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ysksn 9dd5e329ab Remove empty strings (#5732)
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
Surinna Curtis 031a5a8f92 Optional notification muting (#5087)
7 years ago
aschmitz b95c48748c Per-user reblog hiding implementation/fixes/tests
7 years ago
Nanamachi d200e041fe Rewrite account_controller_spec (#5633)
7 years ago
David Yip 4fa2f7e82d Set up /settings/keyword_mutes. #164.
7 years ago
David Yip 6cd5b3bbe5 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 3283868e28 Improve spec of Feed and UserTrackingConcern (#5367)
7 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
Akihiko Odaki cc796298c9 Fix pagination in Api::V1::BlocksController (#5285)
7 years ago
nullkal 633426b261 Add moderation note (#5240)
7 years ago
Eugen Rochko f486ef2666 Redesign public hashtag pages (#5237)
7 years ago
utam0k b3af3f9f8c Implement EmailBlackList (#5109)
7 years ago
Yamagishi Kazutoshi 178f718a9b Separate notifications preferences from general preferences (#4447)
7 years ago
ThibG dfaa219f88 Fix HTTP responses for salmon and ActivityPub inbox processing (#5200)
7 years ago
Eugen Rochko 47ecd652d3 Make Chrome splash screen same color as web UI's background color (#5169)
7 years ago
Akihiko Odaki cdacac8c6c Fix order of paginated accounts in FollowerDomainsController and spec (#3357)
7 years ago
Eugen Rochko eb605141ff Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)
7 years ago
Eugen Rochko 4ec1771165 Add ability to specify alternative text for media attachments (#5123)
7 years ago
Ondřej Hruška 83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
7 years ago
Ondřej Hruška 9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
7 years ago
Eugen Rochko 293972f716 New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)
7 years ago
aschmitz 669fe9ee06 Change IDs to strings rather than numbers in API JSON output (#5019)
7 years ago
Eugen Rochko ad8e856a5b Fix error when following locked accounts (#4896)
7 years ago
Eugen Rochko 472df24579 When web UI URL used while logged out, redirect to static page (#4954)
7 years ago
Surinna Curtis 83b3a0389c Add more specs for the /api/v1/mutes/details endpoint
7 years ago
Surinna Curtis 70592cdaba Add a /api/v1/mutes/details route that just returns the array of mutes.
7 years ago
Surinna Curtis eaaf2170fe API support for muting notifications (and specs)
7 years ago
Eugen Rochko 0ef9d45d05 Fix error when following locked accounts (#4896)
7 years ago
Surinna Curtis 3cac5bc2c3 Fix a spuriously failing spec that assumed we required short bios like upstream
7 years ago
Eugen Rochko c450ddb613 Fix POST /api/v1/follows error when already following (#4878)
7 years ago
Eugen Rochko 7d7844a47f Default follows for new users (#4871)
7 years ago
Eugen Rochko 9b994c4aee Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)
7 years ago
nullkal 2293466edd Show pinned statuses only in the top of the profile page (#4803)
7 years ago
unarist 6a4e2db661 Raise an error for remote url in StatusFinder (#4776)
7 years ago
Eugen Rochko e95bdec7c5 Update status embeds (#4742)
7 years ago
abcang ce9a5f358e rescue HTTP::ConnectionError in RemoteFollowController#create (#4726)
7 years ago
nullkal c2af138113 Allow multiple pinned statuses to be shown and make them be ordered b… (#4690)
7 years ago
Eugen Rochko 9caa90025f Pinned statuses (#4675)
7 years ago
unarist b01a19fe39 Fetch reblogs as Announce activity instead of Note object (#4672)
7 years ago
Eugen Rochko c66fe2aeba Minor performance improvement for test suite (#4678)
7 years ago
nullkal 80393a23d0 Use checkboxes for application scope setting (#4671)
7 years ago
Eugen Rochko c1b086a538 Fix up the applications area (#4664)
7 years ago
Colin Mitchell 871c0d251a Application prefs section (#2758)
7 years ago
Eugen Rochko 74e5078795 Fix #4637 - Re-add missing doorkeeper_authorize for /api/v1/verify_credentials (#4650)
7 years ago
Yamagishi Kazutoshi 2edfdab6e6 Don't send Link header when don't know prev and next links (#4633)
7 years ago
Eugen Rochko 6df8bd277b Set correct content-type for ActivityPub JSON (#4592)
7 years ago
Eugen Rochko 4e75f0d889 Hook up URL-based resource look-up to ActivityPub (#4589)
7 years ago
Eugen Rochko a2aeacbfee Add alternate links to ActivityPub resources from HTML/HEAD variants (#4586)
7 years ago
Eugen Rochko b7370ac8ba ActivityPub delivery (#4566)
7 years ago
Eugen Rochko fdea173237 Add Digest header to requests with body, handle acct and URI keyId (#4565)
7 years ago
Eugen Rochko dd7ef0dc41 Add ActivityPub inbox (#4216)
7 years ago
Eugen Rochko df605f0f8b Add "signed in as" header to some pages (#4523)
7 years ago
nullkal dfcd2834f9 Redirect to PasswordController#new when reset_password_token is invalid (#4506)
7 years ago
Akihiko Odaki 0f92119ceb Cover Api::V1:FavouritesController more (#4409)
7 years ago
Akihiko Odaki 4f0b638cda Introduce access token fabricators (#4401)
7 years ago
Akihiko Odaki bdf573d140 Remove redundant fabrication in the spec for Api::V1::FavouritesController (#4391)
7 years ago
Sorin Davidoi 9075c90c46 feat: Enable push subscription for mobile devices by default (#4321)
7 years ago
Eugen Rochko 1fcdaafa6f Fix webfinger retries (#4275)
7 years ago
abcang 4d42a38954 Improve admin page (#4121)
7 years ago
Eugen Rochko 8c45cd0e36 Improve ActivityPub representations (#3844)
7 years ago
Eugen Rochko cd9b2ab2f7 Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)
7 years ago
Eugen Rochko 1618b68bfa HTTP signatures (#4146)
7 years ago
Sorin Davidoi 0c7c188c45 Web Push Notifications (#3243)
7 years ago
Eugen Rochko 056b5ed72f Improve UI of admin site settings (#4163)
7 years ago
STJrInuyasha 7a889a8e12 Remote following success page (#4129)
7 years ago
Eugen Rochko 864e3f8d9c Replace OEmbed and initial state Rabl templates with serializers (#4110)
7 years ago
Matt Jankowski 6dd5eac7fc Add controller spec for manifests controller (#4003)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 0a53ca444a Cover Admin::AccountsController more (#3327)
7 years ago
Eugen Rochko 42b8220632 Fix #1624 - Send e-mail notifications to admins about new reports (#3949)
7 years ago
Eugen Rochko 5e8d037e27 Fix #3910 - Require OTP authentication to disable 2FA (#3935)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 67243bda31 Cover Auth::RegistrationsController more (#3353)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 8f991831b8 Cover Admin::DomainBlocksController more (#3329)
7 years ago
masarakki ff142eb64d setting-for-account-deletable (#3852)
8 years ago
Eugen Rochko f3be605286 Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847)
8 years ago
Eugen Rochko 91c71471ab Fix account delete form not accepting password, update suspended (#3745)
8 years ago
Eugen Rochko 4a618908e8 Account deletion (#3728)
8 years ago
unarist abbdacedc5 Fix locale related specs (#3707)
8 years ago
René Klačan dcf0530218 Make sure email is case insensitive on all places (#3688)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 4919b89ab8 Improve default language decision and spec (#3351)
8 years ago
Matt Jankowski 2925372ff4 Move create/destroy actions for api/v1/statuses to namespace (#3678)
8 years ago
Matt Jankowski 5282ba862a Move reblogged_by and favourited_by actions out of api/v1/statuses and into unique controllers (#3646)
8 years ago
Matt Jankowski 73540ffe6b Clean up for api/base controller (#3629)
8 years ago
unarist 0f1b1d78b1 Use "match_array" only for order independent assertions (#3626)
8 years ago
Matt Jankowski f0634ba876 Coverage improvement and concern extraction for rate limit headers in API controller (#3625)
8 years ago
Daigo 3 Dango 2985d08951 Redirect to streaming_api_base_url (#3579)
8 years ago
Yamagishi Kazutoshi e878ddb7c0 Fix spec for #2388 (#3526)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 10768aa204 Spec response for forgery (#3248)
8 years ago
Matt Jankowski 5c63523972 Spec coverage and refactor for the api/v1/accounts controllers (#3451)
8 years ago
Matt Jankowski de4681b2be Move admin/pubsubhubbub controller to admin/subscriptions (#3442)
8 years ago
Matt Jankowski 5236a62861 Improve spec coverage and clean up api/v1/blocks controller (#3464)
8 years ago
Matt Jankowski 0f155829b7 Improve spec coverage and clean up api/v1/follow_requests controller (#3465)
8 years ago
Matt Jankowski 84dda45df9 Improve spec coverage and clean up api/v1/domain_blocks controller (#3466)
8 years ago
Matt Jankowski 75cad1d9d6 Improve spec coverage and clean up api/v1/favourites controller (#3472)
8 years ago
Matt Jankowski bf811e4d4a Improve spec coverage and clean up api/v1/mutes controller (#3481)
8 years ago
Yamagishi Kazutoshi 41fa53253c Keep ENV['LOCAL_HTTPS'] with ApplicationControllerSpec (fix random fail) (#3479)
8 years ago
Matt Jankowski 8235623362 Improve spec coverage and clean up api/v1/media controller (#3467)
8 years ago
Matt Jankowski 83435c49ea Clean up api/subscriptions controller (#3448)
8 years ago
Matt Jankowski 3576fa0d59 Improve api oembed controller (#3450)
8 years ago
Matt Jankowski 1dcfb90202 Clean up api/salmon controller (#3449)
8 years ago
Matt Jankowski 0ebe7d6d23 Remove exports/base controller in favor of shared concern (#3444)
8 years ago
Akihiko Odaki 67bc58dd60 Use around hook to restore context in Admin::SettingsController spec (#3428)
8 years ago
Jack Jennings 3a2003ba86 Extract authorization policy for viewing statuses (#3150)
8 years ago
Akihiko Odaki 922fb74197 Remove methods from ObfuscateFilename and spec (#3347)
8 years ago
Akihiko Odaki 7bf2d6cb06 Spec Auth::ConfirmationsController (#3348)
8 years ago
Akihiko Odaki 11e5c965c3 Spec AccountControllerConcern (#3349)
8 years ago
Akihiko Odaki 34157d118c Cover Admin::ReportsController more (#3346)
8 years ago
Akihiko Odaki 7b92950f1c Cover InstancesController more (#3342)
8 years ago
Akihiko Odaki 97d7028c31 Cover Admin::SuspensionsController more (#3350)
8 years ago
Akihiko Odaki a7f2961621 Spec Auth::PasswordsController (#3352)
8 years ago
Akihiko Odaki 00dda99789 Spec Admin::ResetsController calls send_reset_password_instructions (#3354)
8 years ago
Akihiko Odaki 2e27ce3b61 Spec #destroy feature of Admin::TwoFactorAuthenticationsController (#3355)
8 years ago
Akihiko Odaki 2c10c5a069 Coever Admin::SilencesController more (#3356)
8 years ago
Akihiko Odaki bd4dd4c4a0 Cover Settings::ExportsController more (#3358)
8 years ago
Akihiko Odaki 7d33b60f3f Cover Oauth::AuthorizedApplicationsController (#3359)
8 years ago
Akihiko Odaki aecce5694b Cover Oauth::AuthorizationsController more (#3361)
8 years ago
Akihiko Odaki 0e4ca51951 Cover Settings::TwoFactorAuthenticationsController more (#3376)
8 years ago
Akihiko Odaki dde043f6cd Cover WellKnown::HostMetaController more (#3382)
8 years ago
Akihiko Odaki c778a60e4f Cover Settings::TwoFactorAuthentication::RecoveryCodesController more (#3383)
8 years ago
Akihiko Odaki c347327d54 Spec Settings::Exports (#3384)
8 years ago
Akihiko Odaki fd328cf6e8 Cover WellKnown::WebfingerController more (#3385)
8 years ago
Akihiko Odaki 7b473d7514 Cover Settings::TwoFactorAuthentication::ConfirmationsController more (#3386)
8 years ago
Akihiko Odaki 7a281c477a Cover Admin::PubSubHubHubController more (#3343)
8 years ago
Atsushi Yamamoto 402c19a924 Add preference setting for delete toot modal (#3368)
8 years ago