317 Commits (707b8d7d75d8f44b4a638752b6a24824c0ba4bbd)

Author SHA1 Message Date
Thibaut Girka d17844e6d1 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 774ac47373
Add conversations API (#8832)
6 years ago
Thibaut Girka 611740ce81 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 09d789e79b
Add POST /api/v1/notifications/:id/dismiss (#8905)
6 years ago
Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 1e75e74f6b
Support /.well-known/change-password (#8828)
6 years ago
Eugen Rochko f0fff3eb10
Support min_id-based pagination in REST API (#8736)
6 years ago
Thibaut Girka 7ea4c793d6 Allow to show a specific status in the admin interface
6 years ago
Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko ccc2f608c5
Redirect from old authorize_follow path (#8584)
6 years ago
Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko a2cabf3f4a
Add admin custom CSS setting (#8399)
6 years ago
Thibaut Girka e70fc059a9 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 2374a00c10
Add confirmation step to account suspensions (#8353)
6 years ago
Thibaut Girka 8b4abaa90d Merge branch 'master' into glitch-soc/master
6 years ago
ThibG b34d6238cb Add API endpoint to list featured accounts (fixes #8315) (#8317)
6 years ago
Thibaut Girka 88a0395a58 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 9dd5639f90
Add admin function to deactivate all invites (#8279)
6 years ago
Thibaut Girka bfeac6747a Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 78fa926ed5
Add remote interaction dialog for toots (#8202)
6 years ago
Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko f2404de871
Public profile endorsements (accounts picked by profile owner) (#8146)
6 years ago
Thibaut Girka 7dbed4dab9 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 2354b10eb5
Add admin dashboard (#8029)
6 years ago
Eugen Rochko e55dce3176
Add federation relay support (#7998)
6 years ago
Thibaut Girka 402da8065c Migrate glitch-soc keyword mutes to Mastodon's
6 years ago
Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge
6 years ago
Eugen Rochko 6b9e03e002
Add API method to remove a suggestion (#7978)
6 years ago
Eugen Rochko da8fe8079e
Re-add follow recommendations API (#7918)
6 years ago
Eugen Rochko cdb101340a
Keyword/phrase filtering (#7905)
6 years ago
David Yip c55263027a
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 0deb9fa6b9
Remove trending hashtags (#7711)
7 years ago
Thibaut Girka c087738270 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 8bb74e50be
Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)
7 years ago
Eugen Rochko 9bd23dc4e5
Track trending tags (#7638)
7 years ago
Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 8378b72eba
Ensure push subscription is immediately removed when application is revoked (#7548)
7 years ago
Thibaut Girka ba7ee67498 Merge branch 'master' into glitch-soc/merge
7 years ago
Eugen Rochko 97e43ec5f0
Add GET /api/v1/push/subscription REST API (#7471)
7 years ago
Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge
7 years ago
Eugen Rochko b4fb766b23
Add REST API for Web Push Notifications subscriptions (#7445)
7 years ago
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
7 years ago
Shuhei Kitagawa bd10a7e480 Add resend confirmation for admin (#7378)
7 years ago
Eugen Rochko c7d1a2e400
Improve admin UI for accounts (#7360)
7 years ago
Kaito Sinclaire 156b916caf Direct messages column (#4514)
7 years ago
Thibaut Girka 50eb8f1f61 Add backend support for bookmarks
7 years ago
Jenkins 33c2bbdda7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith 219a4423d8 Feature: Allow staff to change user emails (#7074)
7 years ago
David Yip 67e77f230e
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ThibG 1364e9e4ae Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)
7 years ago
Jenkins 6611100480 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith e85cffb236 Feature: Report improvements (#6967) (#7000)
7 years ago
Emelia Smith e7a1716701 Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)
7 years ago
Jenkins 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 9110db41c5
Federate pinned statuses over ActivityPub (#6610)
7 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko 61ed133fea
Account archive download (#6460)
7 years ago
David Yip 3d033a4687
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 9dbae6e8a1
Save video metadata and improve video OpenGraph tags (#6481)
7 years ago
David Yip a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 26f21fd5a0
CAS + SAML authentication feature (#6425)
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 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 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 38fc1b498d
Add more instance stats APIs (#6125)
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
kibigo! dabf66e676 Moved flavour UI into own prefs tab
7 years ago
David Yip 7463d80ff4
Merge remote-tracking branch 'tootsuite/master'
7 years ago
Eugen Rochko 706e534455
Add UI for setting up account migration (#5832)
7 years ago
David Yip e77c3996a5
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 740f8a95a9
Add consumable invites (#5814)
7 years ago
Jenkins 167fe2ab08 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko e84fecb7e9
Add logging of admin actions (#5757)
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
Yamagishi Kazutoshi dc6e031364 Redirect to reports when moderator (#5733)
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
Eugen Rochko 7bb8b0b2fc
Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
Eugen Rochko 1032f3994f
Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
David Yip 870d71b78b Merge branch 'master' into gs-master
7 years ago
nullkal 781105293c Feature: Unlisted custom emojis (#5485)
7 years ago
beatrix a2612d0d38 Merge pull request #179 from glitch-soc/keyword-mute
7 years ago
David Yip 42f2045c21 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
Matthew Walsh 3db80f75a6 Added a timeline for Direct statuses
7 years ago
David Yip cd04e3df58 Fill in create, edit, update, and destroy for keyword mutes interface.
7 years ago
David Yip 4fa2f7e82d Set up /settings/keyword_mutes. #164.
7 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
nullkal 633426b261 Add moderation note (#5240)
7 years ago
Eugen Rochko 3a3475450e Encode custom emojis as resolveable objects in ActivityPub (#5243)
7 years ago
Eugen Rochko 49cc0eb3e7 Improve admin UI for custom emojis, add copy/disable/enable (#5231)
7 years ago
utam0k b3af3f9f8c Implement EmailBlackList (#5109)
7 years ago
Yamagishi Kazutoshi 178f718a9b Separate notifications preferences from general preferences (#4447)
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