summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-06-23fixes- found that TwitterAPI.Controller adds .json suffix alreadyVivian Lim
2018-06-23return empty array for api/qvitter/mutes.json queries instead of htmlVivian Lim
2018-06-23fix mind-crushingly dumb syntax errorsquidboi
2018-06-23change moved attributes into normal variablessquidboi
2018-06-23move configurable module attributes into relevant functionssquidboi
2018-06-23[Pleroma.Web.MastodonApi.MastodonApiController] Add ↵Haelwenn (lanodan) Monnier
initial_state.meta.max_toot_chars
2018-06-23[Pleroma.Web.MastodonApi.MastodonApiController] Add /api/v2/searchHaelwenn (lanodan) Monnier
2018-06-23Fake 2.4.0 APIHaelwenn (lanodan) Monnier
2018-06-23lib/pleroma/web/activity_pub/mrf/simple_policy.ex: mix formatHaelwenn (lanodan) Monnier
Hnng!
2018-06-21Normalize file extension for uploaded filesFrancis Dinh
2018-06-21Merge branch 'feature/mrf-simple-accept-lists' into 'develop'lambda
mrf simple: add accept lists See merge request pleroma/pleroma!231
2018-06-19mrf simple: add accept listsWilliam Pitcock
accept lists supplement reject lists by requiring that any message accepted by contained by the accept list. in other words, this functionality can be used to implement instances similar to awoo.space.
2018-06-19Merge branch 'features/column_media_streaming' into 'develop'lambda
Add streaming to media tabs of federated and local TLs See merge request pleroma/pleroma!225
2018-06-19Merge branch 'bugfix/block-follow-relationships' into 'develop'lambda
fix follow relationship leaks when blocked See merge request pleroma/pleroma!230
2018-06-19tests: fix a completely bogus mastodon api testWilliam Pitcock
2018-06-19user: add helper function to fetch a user given only an ap_id (fix tests)William Pitcock
2018-06-19Merge branch 'feature/exclude-replies-filter' into 'develop'lambda
activitypub: support filtering activities by whether or not they are a reply (closes #109) Closes #109 See merge request pleroma/pleroma!226
2018-06-19Merge branch 'bugfix/as2-contentmap' into 'develop'lambda
handle ActivityStreams 2.0 contentMap See merge request pleroma/pleroma!229
2018-06-19tests: transmogrifier: ensure incoming blocks have the same effect as local ↵William Pitcock
blocks
2018-06-19tests: prove that the block code is properly destroying follow relationshipsWilliam Pitcock
2018-06-19user: when processing a block in User.block(), ensure all follow ↵William Pitcock
relationships are broken this is needed for activitypub conformance ref #213
2018-06-18tests: add regression test for contentMap-only postsWilliam Pitcock
2018-06-18activitypub transmogrifier: fix handling of contentMap.William Pitcock
2018-06-18config: add application/xml mimetype support.William Pitcock
application/xml is the older xml mimetype. some legacy scripts make use of it, as well as common use for debugging with curl and other tools. so it makes sense to have it alongside text/xml.
2018-06-18object: add helper functions to handle various forms of a given object and ↵William Pitcock
return a normalized one
2018-06-18ostatus: we need to include the original author of a message as a mentionWilliam Pitcock
this is due to the use of activity.recipients which may not necessarily contain the original author if the actors are not following each other.
2018-06-18activitypub: filter destination list for announce activities differently ↵William Pitcock
than normal (closes #164)
2018-06-18activitypub: support filtering activities by whether or not they are a reply ↵William Pitcock
(closes #109)
2018-06-17MastodonAPI: Add streaming to media tabs of federated and local TLsHaelwenn (lanodan) Monnier
2018-06-17Token-generating taskHenry Jameson
2018-06-17Merge branch 'patch-2' into 'develop'lambda
Comment for Old Servers See merge request pleroma/pleroma!224
2018-06-16added info about block configuration to CONFIGURATION.mdsquidboi
2018-06-16Merge branch 'develop' into feature/configurable-blockssquidboi
2018-06-16Add comment about TLS curves for older servers.Artik Banana
2018-06-16Merge branch 'feature/configure-mrf-rejectnonpublic' into 'develop'lambda
Configs for mrf_rejectnonpublic See merge request pleroma/pleroma!205
2018-06-15Merge branch 'bugfix/mastofe_thread_render' into 'develop'eal
lib/pleroma/web/mastodon_api/views/status_view.ex: Fix status.json so it renders threads See merge request pleroma/pleroma!223
2018-06-15Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threadsHaelwenn (lanodan) Monnier
2018-06-15Fix typolain
2018-06-14Merge branch 'fix/missing-file-extension' into 'develop'lambda
Add missing file extension if file does not have one See merge request pleroma/pleroma!222
2018-06-14Add missing file extension if file does not have oneFrancis Dinh
2018-06-14Merge branch 'fix/mp3-recognition' into 'develop'lambda
upload.ex: add MPEG Layer 3 file header. See merge request pleroma/pleroma!221
2018-06-14upload.ex: add MPEG Layer 3 file header.eal
2018-06-14Merge branch 'patch-2' into 'develop'lambda
* fix nginx 1.15 warning: See merge request pleroma/pleroma!213
2018-06-14Merge branch 'bugfix/mrf-orphaning' into 'develop'lambda
activitypub transmogrifier: handle activity lookup failure Closes #156 See merge request pleroma/pleroma!216
2018-06-14Merge branch 'feature/twitterapi-unrepeat' into 'develop'lambda
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce See merge request pleroma/pleroma!218
2018-06-14Merge branch 'bugfix/oauth2-param-name' into 'develop'lambda
oauth: support either name or username parameter with grant_type=password Closes #180 See merge request pleroma/pleroma!219
2018-06-14Merge branch 'bugfix/oauth-password-with-email' into 'develop'lambda
oauth: fix password-based login when username is email address Closes #199 See merge request pleroma/pleroma!220
2018-06-14Merge branch 'bugfix/mastodon-streaming-blocks' into 'develop'lambda
streamer: don't relay boosts of messages which would otherwise be blocked Closes #204 See merge request pleroma/pleroma!215
2018-06-14oauth: fix password-based login when username is email addressWilliam Pitcock
closes #199
2018-06-14oauth: support either name or username parameter with grant_type=passwordWilliam Pitcock
closes #180