Commit Graph

1747 Commits (33b033421649f6a7354616ff3458b856ca89637c)
 

Author SHA1 Message Date
lambda 33b0334216 Merge branch 'bugfix/status-url-field' into 'develop'
6 years ago
lambda b06e61bc4e Merge branch 'bugfix/x509-public-key' into 'develop'
6 years ago
William Pitcock 8546551257 activitypub: switch to using x509 representation for public keys instead of pkcs#1
6 years ago
Haelwenn (lanodan) Monnier 7a351cb36f
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses
6 years ago
lambda d386e8a825 Merge branch 'features/initial-state_rights' into 'develop'
6 years ago
Haelwenn (lanodan) Monnier beb940a57e
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Add rights to initial_state
6 years ago
lambda fc012491a5 Merge branch 'fix/mutes.json-emptyarray' into 'develop'
6 years ago
lambda dfc96f222c Merge branch 'feature/configurable-blocks' into 'develop'
6 years ago
squidboi ea214b8ba6
combined outgoing_blocks with statement
6 years ago
Vivian Lim 6160a1b3c0 mix format
6 years ago
lambda 92135d00fc Merge branch 'feature/application-xml-mime' into 'develop'
6 years ago
lambda c3002c583e Merge branch 'features/glitch-soc-frontend' into 'develop'
6 years ago
Vivian Lim 1299bccc7d return unquoted empty array from /api/qvitter/mutes.json
6 years ago
Vivian Lim 6316003946 fixes- found that TwitterAPI.Controller adds .json suffix already
6 years ago
Vivian Lim f2badd4424 return empty array for api/qvitter/mutes.json queries instead of html
6 years ago
squidboi c4038ede07
fix mind-crushingly dumb syntax error
6 years ago
squidboi f4990283de
change moved attributes into normal variables
6 years ago
squidboi 4e099fcfa9
move configurable module attributes into relevant functions
6 years ago
Haelwenn (lanodan) Monnier 5a4a45b875
[Pleroma.Web.MastodonApi.MastodonApiController] Add initial_state.meta.max_toot_chars
6 years ago
Haelwenn (lanodan) Monnier a05c0ff61d
[Pleroma.Web.MastodonApi.MastodonApiController] Add /api/v2/search
6 years ago
Haelwenn (lanodan) Monnier 359093d73b
Fake 2.4.0 API
6 years ago
Haelwenn (lanodan) Monnier c45133377a
lib/pleroma/web/activity_pub/mrf/simple_policy.ex: mix format
6 years ago
lambda ad28854f47 Merge branch 'feature/mrf-simple-accept-lists' into 'develop'
6 years ago
William Pitcock 60d6038be5 mrf simple: add accept lists
6 years ago
lambda 90cf75f4a7 Merge branch 'features/column_media_streaming' into 'develop'
6 years ago
lambda be800d7936 Merge branch 'bugfix/block-follow-relationships' into 'develop'
6 years ago
William Pitcock 590e8d5555 tests: fix a completely bogus mastodon api test
6 years ago
William Pitcock 056305dfa7 user: add helper function to fetch a user given only an ap_id (fix tests)
6 years ago
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 3707a7fa42 tests: transmogrifier: ensure incoming blocks have the same effect as local blocks
6 years ago
William Pitcock e9ed7eb963 tests: prove that the block code is properly destroying follow relationships
6 years ago
William Pitcock 320ca7b11e user: when processing a block in User.block(), ensure all follow relationships are broken
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 c5bbc46f87 config: add application/xml mimetype support.
6 years ago
William Pitcock 4f589998ee activitypub: support filtering activities by whether or not they are a reply (closes #109)
6 years ago
Haelwenn (lanodan) Monnier b670d4d683
MastodonAPI: Add streaming to media tabs of federated and local TLs
6 years ago
lambda 25946f772d Merge branch 'patch-2' into 'develop'
6 years ago
squidboi 63946a6af3
added info about block configuration to CONFIGURATION.md
6 years ago
squidboi 2e294ee44a Merge branch 'develop' into feature/configurable-blocks
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