350 Commits (2e58fed4c639df938a09243ab91d91d1ece1bab7)

Author SHA1 Message Date
Thibaut Girka 28ccf0a464 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
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