Commit graph

2047 commits

Author SHA1 Message Date
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
eal
22bbe27115 TwitterAPI: Add unimplemented /friendships/no_retweets/ids. 2017-11-14 16:10:13 +02:00
lambda
dd76036cbb Merge branch 'mastoapi-media-timeline' into 'develop'
MastoAPI: Add media timelines.

Closes #63

See merge request pleroma/pleroma!16
2017-11-14 14:09:36 +00:00
eal
3533bf7eac TwitterAPI: Add /friends/ids. 2017-11-14 16:04:58 +02:00
eal
06c3ee3bac Accept 1 as true. 2017-11-14 15:54:50 +02:00
eal
c84723b679 MastoAPI: Add media timelines. 2017-11-14 15:41:16 +02:00
Roger Braun
773eba4f0b Update frontend. 2017-11-14 09:34:28 +01:00
Roger Braun
083cd169d2 MastoAPI: Fix repeat api bug.
Documentation was wrong, reblogging actually returns the reblog, not
the reblogged status.
2017-11-13 09:48:56 +01:00
Roger Braun
5fc6e9d467 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2017-11-12 14:25:15 +01:00
Roger Braun
d293ceb1b5 Add Mastodon frontend. 2017-11-12 14:23:05 +01:00
lambda
08bc316742 Merge branch 'mastodon-notification-endpoints' into 'develop'
MastoAPI: Add notification endpoints get, clear and dismiss.

Closes #42

See merge request pleroma/pleroma!13
2017-11-12 11:08:06 +00:00
lambda
87dee3902a Merge branch 'filetype-recognition' into 'develop'
Use headers for file content type recognition.

See merge request pleroma/pleroma!14
2017-11-12 09:27:59 +00:00