summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2018-06-13fixup testFrancis Dinh
2018-06-13Add unretweet TwAPI endpoint and cleanup AP.unannounceFrancis Dinh
2018-06-13activitypub transmogrifier: handle activity lookup failureWilliam Pitcock
with the introduction of MRF, it is possible that an activity may be orphaned from it's parent, if an activity in the chain was rejected by the active MRF policies. accordingly, handle this in the same way as any other orphaned activity. closes #156
2018-06-13streamer: don't relay boosts of messages which would otherwise be blockedWilliam Pitcock
2018-06-13* fix nginx 1.15 warning:dex
nginx: [warn] the "ssl" directive is deprecated, use the "listen ... ssl" directive instead
2018-06-13Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop'lambda
webfinger: send JRD by default instead of XRD See merge request pleroma/pleroma!211
2018-06-13webfinger: send JRD by default instead of XRDWilliam Pitcock
JRD being the default representation for WebFinger responses was standardized 5 years ago in RFC 7033.
2018-06-13Merge branch 'bugfix/webfinger-refactoring' into 'develop'lambda
webfinger: refactor webfinger() functions Closes #212 See merge request pleroma/pleroma!210
2018-06-13webfinger: refactor webfinger() functionsWilliam Pitcock
- remove code duplication - move user lookup to parent with statement - tighten both user lookup by nickname and activitypub URI with a type constraint
2018-06-12newlinessquidboi
2018-06-12split lines, explicitly advised against editing default config filessquidboi
2018-06-12update frontendlain
2018-06-12set_moderator: ensureall applications are started.eal
2018-06-12Merge branch 'patch-2' into 'develop'lambda
Proposal: Default Avatar Replacement See merge request pleroma/pleroma!209
2018-06-12formattingHenry Jameson
2018-06-12Replace avi.png with the Pleroma logoArtik Banana
2018-06-12Initial invites support + tests.Henry Jameson
2018-06-12Merge branch 'develop' into 'develop'lambda
Dedupe uploads See merge request pleroma/pleroma!115
2018-06-12Update sample_config.eexlambda
2018-06-12Merge branch 'feature/list-streaming' into 'develop'lambda
MastoAPI: Add streaming for lists. See merge request pleroma/pleroma!183
2018-06-12Merge branch 'feature/locked-accounts-part-1' into 'develop'lambda
locked accounts See merge request pleroma/pleroma!180
2018-06-12Merge branch 'patch-2' into 'develop'lambda
Nginx Config - Security Upgrades See merge request pleroma/pleroma!207
2018-06-11router: remove stub /domain_blocks entryWilliam Pitcock
2018-06-11* Removed TLSv1 and TLSv1.1Artik Banana
* Added OCSP Stapling * Added SSL Cache * Changed ciphers * Specified ECDH curves
2018-06-11Security upgrades:Artik Banana
* Removed TLSv1 and TLSv1.1 * Added OCSP Stapling * Added SSL Cache * Changed ciphers * Specified ECDH curves
2018-06-11tests: update twitterapi user view tests for new locked variableWilliam Pitcock
2018-06-11twitter api: add approve/deny endpointsWilliam Pitcock
2018-06-11tests: add tests for /api/pleroma/friend_requestsWilliam Pitcock
2018-06-11twitter api: add friend requests list apiWilliam Pitcock
2018-06-11twitterapi: user view: return if an account is locked or notWilliam Pitcock
2018-06-11activitypub transmogrifier: accept/reject outgoing: we might send the actual ↵William Pitcock
object instead of the URI in some cases, handle it
2018-06-11run mix formatWilliam Pitcock
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 21:13:23 +0000