summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2017-11-22Update frontend.Roger Braun
2017-11-21Merge branch 'fix/self-follow' into 'develop'eal
Dont include the user in their own follower count. See merge request pleroma/pleroma!29
2017-11-21Do not include user in their own follower count.eal
2017-11-20Merge branch 'fix/mastoapi-attachment-count' into 'develop'eal
MastoAPI: no more than 4 attachments. See merge request pleroma/pleroma!28
2017-11-20MastoAPI: no more than 4 attachments.eal
2017-11-20Fix a links... Retweet button still broken.Hyper! (Stitch)
2017-11-20Make /api/friends/ids test deterministic.eal
2017-11-20Update pl-dark-masto-fe.cssHyper! (Stitch)
2017-11-20Update pl-dark-masto-fe.css, fix notification_message and retweetHyper! (Stitch)
2017-11-20Treat internal emoji like external.Roger Braun
2017-11-20MastoAPI: Add max_toot_chars.Roger Braun
2017-11-20Merge branch 'fix/self-follow' into 'develop'lambda
Fix self follows to be more intuitive, fix minor websocket channel issue See merge request pleroma/pleroma!26
2017-11-20Ensure correct state in self-unfollow.eal
2017-11-20Fix posts being streamed to non-local websocket channels.eal
2017-11-20Make users in tests follow themselves by default.eal
Also fix the semantics of all tests to match.
2017-11-20Don't let the user unfollow their own account.eal