summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-12-08Merge branch 'fix/mastoapi-attachment-linking' into 'develop'lambda
MastoAPI: don't add attachment links. Closes #92 See merge request pleroma/pleroma!37
2017-12-08Merge branch 'postgresetup' into 'develop'lambda
first version of safe DB setup See merge request pleroma/pleroma!32
2017-12-07Allow parentheses in links.eal
2017-12-07Fix HTML escape breaking some links.eal
2017-12-07MastoAPI: don't add attachment links.eal
2017-12-07Add websocket upgrade to example nginx config.eal
2017-12-07User deletion: Remove relationships.Lain Iwakura
2017-12-07Don't follow deactivated users.Lain Iwakura
2017-12-07Add function to deactivate users.Lain Iwakura
2017-12-07Don't log in deactivated users.Lain Iwakura
2017-12-06Priority queue fixes.Lain Iwakura
2017-12-05Add basic queue prioritization.Lain Iwakura
2017-12-05Merge remote-tracking branch 'upstream/develop' into media-proxyhref
2017-12-05Merge branch 'feature/chat' into 'develop'lambda
Feature/chat See merge request pleroma/pleroma!36
2017-12-05Fix tests.Lain Iwakura
2017-12-05Update frontend.Lain Iwakura
2017-12-05Update frontend.Lain Iwakura
2017-12-05Merge remote-tracking branch 'origin/develop' into feature/chatRoger Braun
2017-12-05Merge branch 'fix/odd-passwords' into 'develop'lambda
Fix basic auth for passwords with a colon. See merge request pleroma/pleroma!35
2017-12-05Don't save user in socket, just save the name.Roger Braun
2017-12-05Add basic channel state.Roger Braun
2017-12-04Fix basic auth for passwords with a colon.eal
2017-12-04Update frontend.Lain Iwakura
2017-12-04Basic backend chat.Lain Iwakura
2017-12-04unfuckHenry Jameson
2017-12-04made psql script compatible with migrations or generate_config rerunsHenry Jameson
2017-12-04reverts config genHenry Jameson
2017-12-04fixHenry Jameson
2017-12-04fixesHenry Jameson
2017-12-04first version of safe DB setupHenry Jameson
2017-12-03OStatus: Add user bio as summary fieldRoger Braun
Fixes problem with bio federation.
2017-11-30Add count index for local users.Lain Iwakura
2017-11-30MastodonAPI: Add proper user count.Lain Iwakura
2017-11-28Improve error handling, add configurationhref
2017-11-28mandatory typo fix...href
2017-11-28media proxy: good enough wiphref
2017-11-28Merge branch 'salmon-native-keys' into 'develop'lambda
Salmon: generate private key with native crypto if available. See merge request pleroma/pleroma!33
2017-11-28Salmon: generate private key with native crypto if available.href
2017-11-27Return xml notice at /notice path.Lain Iwakura
2017-11-25Merge branch 'patch-1' into 'develop'eal
fix mix typo in README.md See merge request pleroma/pleroma!31
2017-11-25fix mix typo in README.mdPartial name
$ mix phx.serve ** (Mix) The task "phx.serve" could not be found. Did you mean "phx.server"? $ mix phx.server [info] Running Pleroma.Web.Endpoint with Cowboy using http://0.0.0.0:4000
2017-11-24Update frontend.Roger Braun
2017-11-23More readme updates.Lain Iwakura
2017-11-23Add mix deps.get back to readme.Lain Iwakura
2017-11-23Add configuration generation tool, update readme.Lain Iwakura
2017-11-23MastodonUI login: Show error message on error.Roger Braun
2017-11-22untoot.Roger Braun
2017-11-22Merge branch 'develop' into 'develop'lambda
Pleroma-Dark default theme for the Mastodon Frontend See merge request pleroma/pleroma!27
2017-11-22Fixed in-reply CSS, also included full column width (to have timelines take ↵Hyper! (Stitch)
the whole screen size.)
2017-11-22Update README.mdlambda