Commit graph

778 commits

Author SHA1 Message Date
Roger Braun 5945ec84e9 Don't save user in socket, just save the name. 2017-12-05 10:01:36 +01:00
Roger Braun 69f1024bb0 Add basic channel state. 2017-12-05 09:36:26 +01:00
Lain Iwakura d01243c16e Update frontend. 2017-12-04 19:12:31 +01:00
Lain Iwakura 5c40986120 Basic backend chat. 2017-12-04 19:10:15 +01:00
Roger Braun d08a34e88b OStatus: Add user bio as summary field
Fixes problem with bio federation.
2017-12-03 13:34:17 +01:00
Lain Iwakura 50dca016f2 Add count index for local users. 2017-11-30 15:00:12 +01:00
Lain Iwakura 5637d163e6 MastodonAPI: Add proper user count. 2017-11-30 14:59:44 +01:00
lambda 9d1c0ec18d Merge branch 'salmon-native-keys' into 'develop'
Salmon: generate private key with native crypto if available.

See merge request pleroma/pleroma!33
2017-11-28 16:46:01 +00:00
href 4524721fba
Salmon: generate private key with native crypto if available. 2017-11-28 16:50:12 +01:00
Lain Iwakura c680ae581d Return xml notice at /notice path. 2017-11-27 17:24:52 +01:00
eal 89a8dc7485 Merge branch 'patch-1' into 'develop'
fix mix typo in README.md

See merge request pleroma/pleroma!31
2017-11-25 23:10:43 +00:00
Partial name f86fca682a fix mix typo in README.md
$ 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-25 02:42:39 +00:00
Roger Braun 44f7154fb9 Update frontend. 2017-11-24 08:37:41 +01:00
Lain Iwakura 386c130769 More readme updates. 2017-11-23 16:41:09 +01:00
Lain Iwakura ecf109a0fe Add mix deps.get back to readme. 2017-11-23 16:35:03 +01:00
Lain Iwakura 44dc694882 Add configuration generation tool, update readme. 2017-11-23 16:22:20 +01:00
Roger Braun d16b613929 MastodonUI login: Show error message on error. 2017-11-23 12:06:14 +01:00
Roger Braun ad90da07f5 untoot. 2017-11-22 16:10:03 +01:00
lambda 698a75cb39 Merge branch 'develop' into 'develop'
Pleroma-Dark default theme for the Mastodon Frontend

See merge request pleroma/pleroma!27
2017-11-22 14:19:27 +00:00
Hyper! (Stitch) d7b6fa79cb Fixed in-reply CSS, also included full column width (to have timelines take the whole screen size.) 2017-11-22 14:12:04 +00:00
lambda bcc4e73e51 Update README.md 2017-11-22 13:42:27 +00:00
Roger Braun 0716f8e626 Update frontend. 2017-11-22 12:19:13 +01:00
eal 1625021a9c Merge branch 'fix/self-follow' into 'develop'
Dont include the user in their own follower count.

See merge request pleroma/pleroma!29
2017-11-21 23:09:59 +00:00
eal e9037ffc8d Do not include user in their own follower count. 2017-11-21 15:33:09 +02:00
eal 9b35a4e850 Merge branch 'fix/mastoapi-attachment-count' into 'develop'
MastoAPI: no more than 4 attachments.

See merge request pleroma/pleroma!28
2017-11-20 20:55:27 +00:00
eal fa19de97ba MastoAPI: no more than 4 attachments. 2017-11-20 22:49:20 +02:00
Hyper! (Stitch) dae2949bcc Fix a links... Retweet button still broken. 2017-11-20 17:19:22 +00:00
eal 3d29fc5462 Make /api/friends/ids test deterministic. 2017-11-20 19:16:43 +02:00
Hyper! (Stitch) 0c68e75b93 Update pl-dark-masto-fe.css 2017-11-20 17:09:14 +00:00
Hyper! (Stitch) cb071745b5 Update pl-dark-masto-fe.css, fix notification_message and retweet 2017-11-20 16:54:32 +00:00
Roger Braun 747a68a075 Treat internal emoji like external. 2017-11-20 17:53:21 +01:00
Roger Braun cf0bbf320d MastoAPI: Add max_toot_chars. 2017-11-20 08:54:47 +01:00
lambda 6900851581 Merge branch 'fix/self-follow' into 'develop'
Fix self follows to be more intuitive, fix minor websocket channel issue

See merge request pleroma/pleroma!26
2017-11-20 07:27:10 +00:00
eal 8d4e7b32c9 Ensure correct state in self-unfollow. 2017-11-20 09:26:31 +02:00
eal bd921ca5d7 Fix posts being streamed to non-local websocket channels. 2017-11-20 07:58:43 +02:00
eal edc3e5bc30 Make users in tests follow themselves by default.
Also fix the semantics of all tests to match.
2017-11-20 07:52:02 +02:00
eal 4db5954786 Don't let the user unfollow their own account. 2017-11-20 07:50:56 +02:00
eal aadf54e0df Don't show the user in their own following count. 2017-11-20 00:31:39 +02:00
Hyper! (Stitch) 36011fee4e Add Custom Pleroma-dark theme 2017-11-19 19:07:19 +00:00
Hyper! (Stitch) f065689407 Update pl-dark-masto-fe.css 2017-11-19 19:04:51 +00:00
Hyper! (Stitch) 97bb99edba Add new file 2017-11-19 19:04:21 +00:00
Roger Braun 52aa65fe6e Federator Queue: Add seperate in/out queues. 2017-11-19 15:10:51 +01:00
Roger Braun 5ff5d583b6 MastodonAPI: Streaming fixes.
Now shows repeats in the home tl.
2017-11-19 13:47:50 +01:00
Roger Braun f6495abf73 Update frontend. 2017-11-19 13:31:09 +01:00
Roger Braun 0f099dac67 MastodonAPI: Add sign out.
Close #79
2017-11-19 13:23:16 +01:00
Roger Braun 40ca379357 Fix flakey test. 2017-11-19 13:07:29 +01:00
Roger Braun c336a13d2c MastoAPI: Only return create activties in contexts. 2017-11-19 12:59:23 +01:00
lambda a6f65083ae Merge branch 'feature/fix-warnings' into 'develop'
Fix all compilation warnings

See merge request pleroma/pleroma!24
2017-11-19 11:50:02 +00:00
Thog 59770c3f5c
Fix all compilation warnings 2017-11-19 02:22:07 +01:00
lambda ed3403ad8b Merge branch 'formatting-fixes' into 'develop'
Formatting fixes

Closes #80

See merge request pleroma/pleroma!22
2017-11-18 15:58:44 +00:00