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 |
|
eal
|
146ec80285
|
Merge branch 'fix/mastofe-login-redirect' into 'develop'
Redirect to Getting Started on login.
See merge request pleroma/pleroma!21
|
2017-11-18 14:38:05 +00:00 |
|
eal
|
7b397ed125
|
Merge branch 'sensitive-content-bit' into 'develop'
Add #nsfw tag if sensitive content bit is set
Closes #78
See merge request pleroma/pleroma!23
|
2017-11-18 14:34:37 +00:00 |
|
eal
|
f53cdabcdf
|
Add #nsfw tag if sensitive content bit is set
|
2017-11-18 16:30:18 +02:00 |
|
eal
|
31e4277ba5
|
Don't add summary if empty.
|
2017-11-18 15:25:22 +02:00 |
|
eal
|
fb118b2978
|
Don't insert newlines to generated HTML.
MastoFE doesn't like them.
|
2017-11-18 14:46:54 +02:00 |
|
eal
|
66e78c3ec4
|
Escape HTML instead of discarding it.
|
2017-11-18 14:43:41 +02:00 |
|
Roger Braun
|
4647bcd6e6
|
Don't start streamer during tests.
|
2017-11-18 12:22:07 +01:00 |
|
eal
|
9c60cc88df
|
Redirect to Getting Started on login.
|
2017-11-16 20:47:44 +02:00 |
|
Roger Braun
|
a743940463
|
MastoAPI: Implement all streaming functions.
|
2017-11-16 16:49:51 +01:00 |
|
Roger Braun
|
5719f69ae3
|
MastodonAPI: Stream fixes.
|
2017-11-16 13:48:58 +01:00 |
|
lambda
|
a2d7e0f4d4
|
Merge branch 'feature/masto-styled-login-page' into 'develop'
Add styles to make login page resemble mastodon's
See merge request pleroma/pleroma!20
|
2017-11-16 12:01:07 +00:00 |
|
Roger Braun
|
43499848d0
|
Small css fix.
|
2017-11-16 12:58:33 +01:00 |
|
Shpuld Shpuldson
|
189513e4ff
|
Add styles to make login page resemble mastodon's
|
2017-11-16 13:26:56 +02:00 |
|
Roger Braun
|
8de890a0d9
|
Add custom emoji to Mastodon UI initial state.
|
2017-11-16 09:40:06 +01:00 |
|
Roger Braun
|
3d1360c4d6
|
Add mastodon emoji folder.
|
2017-11-16 09:35:14 +01:00 |
|
Roger Braun
|
ced0d64d75
|
MastoAPI: Make attachment ids strings.
|
2017-11-15 18:58:39 +01:00 |
|
lambda
|
1cca544e20
|
Merge branch 'twitterapi-bitlbee' into 'develop'
TwitterAPI: Add missing endpoints for bitlbee.
Closes #67
See merge request pleroma/pleroma!18
|
2017-11-14 16:47:54 +00:00 |
|
lambda
|
1eb7a862d2
|
Merge branch 'twitterapi-show-user' into 'develop'
TwitterAPI: Add /users/show.
See merge request pleroma/pleroma!19
|
2017-11-14 16:44:25 +00:00 |
|
eal
|
f9828e578c
|
TwitterAPI: Add /users/show.
|
2017-11-14 17:34:48 +02:00 |
|
lambda
|
0a69611884
|
Merge branch 'api-links' into 'develop'
Add links to API documentation.
See merge request pleroma/pleroma!17
|
2017-11-14 14:19:39 +00:00 |
|
eal
|
312d389f56
|
Add links to API documentation.
|
2017-11-14 16:15:52 +02:00 |
|
eal
|
163c658202
|
TwitterAPI: Add unimplemented /mutes/users/ids.
|
2017-11-14 16:12:52 +02:00 |
|