Commit Graph

1706 Commits (db0731b6ac077c341f6e6779af2c2d5a94d3d14a)
 

Author SHA1 Message Date
lambda db0731b6ac Merge branch 'feature/exclude-replies-filter' into 'develop'
6 years ago
lambda de80363518 Merge branch 'bugfix/as2-contentmap' into 'develop'
6 years ago
William Pitcock a2c6778ce6 tests: add regression test for contentMap-only posts
6 years ago
William Pitcock c95941e64d activitypub transmogrifier: fix handling of contentMap.
6 years ago
William Pitcock 4f589998ee activitypub: support filtering activities by whether or not they are a reply (closes #109)
6 years ago
lambda 25946f772d Merge branch 'patch-2' into 'develop'
6 years ago
Artik Banana 394d0c94c4 Add comment about TLS curves for older servers.
6 years ago
lambda 1ea4a18ad8 Merge branch 'feature/configure-mrf-rejectnonpublic' into 'develop'
6 years ago
eal a938d07df1 Merge branch 'bugfix/mastofe_thread_render' into 'develop'
6 years ago
Haelwenn (lanodan) Monnier 72c2915ecd
Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
6 years ago
lain 00d7d109ef Fix typo
6 years ago
lambda de20c8d620 Merge branch 'fix/missing-file-extension' into 'develop'
6 years ago
Francis Dinh 0a95b5594b Add missing file extension if file does not have one
6 years ago
lambda 1c676b7573 Merge branch 'fix/mp3-recognition' into 'develop'
6 years ago
eal 12c7a023de upload.ex: add MPEG Layer 3 file header.
6 years ago
lambda 678df59d22 Merge branch 'patch-2' into 'develop'
6 years ago
lambda 2723fb5150 Merge branch 'bugfix/mrf-orphaning' into 'develop'
6 years ago
lambda 8c7fdcb31b Merge branch 'feature/twitterapi-unrepeat' into 'develop'
6 years ago
lambda 2c303b3302 Merge branch 'bugfix/oauth2-param-name' into 'develop'
6 years ago
lambda 280ac243aa Merge branch 'bugfix/oauth-password-with-email' into 'develop'
6 years ago
lambda 408152e232 Merge branch 'bugfix/mastodon-streaming-blocks' into 'develop'
6 years ago
William Pitcock 5442466569 oauth: fix password-based login when username is email address
6 years ago
William Pitcock 4894b88b1b oauth: support either name or username parameter with grant_type=password
6 years ago
Francis Dinh fc15f30a3c fixup test
6 years ago
Francis Dinh 1555c66650 Add unretweet TwAPI endpoint and cleanup AP.unannounce
6 years ago
William Pitcock 401e8af943 activitypub transmogrifier: handle activity lookup failure
6 years ago
William Pitcock b5bc08fac3 streamer: don't relay boosts of messages which would otherwise be blocked
6 years ago
dex 750cfbf38d * fix nginx 1.15 warning:
6 years ago
lambda ea42ba603f Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop'
6 years ago
William Pitcock 3d402a9e20 webfinger: send JRD by default instead of XRD
6 years ago
lambda c02d03a4c2 Merge branch 'bugfix/webfinger-refactoring' into 'develop'
6 years ago
William Pitcock 59f95a7095 webfinger: refactor webfinger() functions
6 years ago
squidboi 2586426fa0
newlines
6 years ago
squidboi a2f7c02108 split lines, explicitly advised against editing default config files
6 years ago
lain ddc654d587 update frontend
6 years ago
eal 3326205f95 set_moderator: ensureall applications are started.
6 years ago
lambda 958cf5da94 Merge branch 'patch-2' into 'develop'
6 years ago
Artik Banana 991b8a6b9d Replace avi.png with the Pleroma logo
6 years ago
lambda 3f42806b1b Merge branch 'develop' into 'develop'
6 years ago
lambda f34232da86 Update sample_config.eex
6 years ago
lambda 564c73ab24 Merge branch 'feature/list-streaming' into 'develop'
6 years ago
lambda a6e0c31518 Merge branch 'feature/locked-accounts-part-1' into 'develop'
6 years ago
lambda 01240fd8b6 Merge branch 'patch-2' into 'develop'
6 years ago
William Pitcock 9810471237 router: remove stub /domain_blocks entry
6 years ago
Artik Banana 93c614bf13 * Removed TLSv1 and TLSv1.1
6 years ago
Artik Banana c645a8de2b Security upgrades:
6 years ago
William Pitcock c773f42ca4 tests: update twitterapi user view tests for new locked variable
6 years ago
William Pitcock f8e0942745 twitter api: add approve/deny endpoints
6 years ago
William Pitcock d116af3bee tests: add tests for /api/pleroma/friend_requests
6 years ago
William Pitcock e08cf21e5b twitter api: add friend requests list api
6 years ago