eal [Tue, 21 Nov 2017 23:09:59 +0000 (23:09 +0000)]
Merge branch 'fix/self-follow' into 'develop'
Dont include the user in their own follower count.
See merge request pleroma/pleroma!29
eal [Tue, 21 Nov 2017 13:33:09 +0000 (15:33 +0200)]
Do not include user in their own follower count.
eal [Mon, 20 Nov 2017 20:55:27 +0000 (20:55 +0000)]
Merge branch 'fix/mastoapi-attachment-count' into 'develop'
MastoAPI: no more than 4 attachments.
See merge request pleroma/pleroma!28
eal [Mon, 20 Nov 2017 20:49:20 +0000 (22:49 +0200)]
MastoAPI: no more than 4 attachments.
eal [Mon, 20 Nov 2017 17:16:43 +0000 (19:16 +0200)]
Make /api/friends/ids test deterministic.
Roger Braun [Mon, 20 Nov 2017 16:53:21 +0000 (17:53 +0100)]
Treat internal emoji like external.
Roger Braun [Mon, 20 Nov 2017 07:54:47 +0000 (08:54 +0100)]
MastoAPI: Add max_toot_chars.
lambda [Mon, 20 Nov 2017 07:27:10 +0000 (07:27 +0000)]
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
eal [Mon, 20 Nov 2017 07:26:31 +0000 (09:26 +0200)]
Ensure correct state in self-unfollow.
eal [Mon, 20 Nov 2017 05:58:43 +0000 (07:58 +0200)]
Fix posts being streamed to non-local websocket channels.
eal [Mon, 20 Nov 2017 05:52:02 +0000 (07:52 +0200)]
Make users in tests follow themselves by default.
Also fix the semantics of all tests to match.
eal [Sun, 19 Nov 2017 23:21:53 +0000 (01:21 +0200)]
Don't let the user unfollow their own account.
eal [Sun, 19 Nov 2017 22:31:39 +0000 (00:31 +0200)]
Don't show the user in their own following count.
Roger Braun [Sun, 19 Nov 2017 14:10:51 +0000 (15:10 +0100)]
Federator Queue: Add seperate in/out queues.
Roger Braun [Sun, 19 Nov 2017 12:47:50 +0000 (13:47 +0100)]
MastodonAPI: Streaming fixes.
Now shows repeats in the home tl.
Roger Braun [Sun, 19 Nov 2017 12:31:09 +0000 (13:31 +0100)]
Update frontend.
Roger Braun [Sun, 19 Nov 2017 12:23:16 +0000 (13:23 +0100)]
MastodonAPI: Add sign out.
Close #79
Roger Braun [Sun, 19 Nov 2017 12:07:29 +0000 (13:07 +0100)]
Fix flakey test.
Roger Braun [Sun, 19 Nov 2017 11:59:23 +0000 (12:59 +0100)]
MastoAPI: Only return create activties in contexts.
lambda [Sun, 19 Nov 2017 11:50:02 +0000 (11:50 +0000)]
Merge branch 'feature/fix-warnings' into 'develop'
Fix all compilation warnings
See merge request pleroma/pleroma!24
Thog [Sun, 19 Nov 2017 01:22:07 +0000 (02:22 +0100)]
Fix all compilation warnings
lambda [Sat, 18 Nov 2017 15:58:44 +0000 (15:58 +0000)]
Merge branch 'formatting-fixes' into 'develop'
Formatting fixes
Closes #80
See merge request pleroma/pleroma!22
eal [Sat, 18 Nov 2017 14:38:05 +0000 (14:38 +0000)]
Merge branch 'fix/mastofe-login-redirect' into 'develop'
Redirect to Getting Started on login.
See merge request pleroma/pleroma!21
eal [Sat, 18 Nov 2017 14:34:37 +0000 (14:34 +0000)]
Merge branch 'sensitive-content-bit' into 'develop'
Add #nsfw tag if sensitive content bit is set
Closes #78
See merge request pleroma/pleroma!23
eal [Sat, 18 Nov 2017 14:30:18 +0000 (16:30 +0200)]
Add #nsfw tag if sensitive content bit is set
eal [Sat, 18 Nov 2017 13:25:22 +0000 (15:25 +0200)]
Don't add summary if empty.
eal [Sat, 18 Nov 2017 12:46:54 +0000 (14:46 +0200)]
Don't insert newlines to generated HTML.
MastoFE doesn't like them.
eal [Sat, 18 Nov 2017 12:43:41 +0000 (14:43 +0200)]
Escape HTML instead of discarding it.
Roger Braun [Sat, 18 Nov 2017 11:22:07 +0000 (12:22 +0100)]
Don't start streamer during tests.
eal [Thu, 16 Nov 2017 18:47:44 +0000 (20:47 +0200)]
Redirect to Getting Started on login.
Roger Braun [Thu, 16 Nov 2017 15:49:51 +0000 (16:49 +0100)]
MastoAPI: Implement all streaming functions.
Roger Braun [Thu, 16 Nov 2017 12:48:58 +0000 (13:48 +0100)]
MastodonAPI: Stream fixes.
lambda [Thu, 16 Nov 2017 12:01:07 +0000 (12:01 +0000)]
Merge branch 'feature/masto-styled-login-page' into 'develop'
Add styles to make login page resemble mastodon's
See merge request pleroma/pleroma!20
Roger Braun [Thu, 16 Nov 2017 11:58:33 +0000 (12:58 +0100)]
Small css fix.
Shpuld Shpuldson [Thu, 16 Nov 2017 11:26:56 +0000 (13:26 +0200)]
Add styles to make login page resemble mastodon's
Roger Braun [Thu, 16 Nov 2017 08:40:06 +0000 (09:40 +0100)]
Add custom emoji to Mastodon UI initial state.
Roger Braun [Thu, 16 Nov 2017 08:35:14 +0000 (09:35 +0100)]
Add mastodon emoji folder.
Roger Braun [Wed, 15 Nov 2017 17:58:13 +0000 (18:58 +0100)]
MastoAPI: Make attachment ids strings.
lambda [Tue, 14 Nov 2017 16:47:54 +0000 (16:47 +0000)]
Merge branch 'twitterapi-bitlbee' into 'develop'
TwitterAPI: Add missing endpoints for bitlbee.
Closes #67
See merge request pleroma/pleroma!18
lambda [Tue, 14 Nov 2017 16:44:25 +0000 (16:44 +0000)]
Merge branch 'twitterapi-show-user' into 'develop'
TwitterAPI: Add /users/show.
See merge request pleroma/pleroma!19
eal [Tue, 14 Nov 2017 15:34:48 +0000 (17:34 +0200)]
TwitterAPI: Add /users/show.
lambda [Tue, 14 Nov 2017 14:19:39 +0000 (14:19 +0000)]
Merge branch 'api-links' into 'develop'
Add links to API documentation.
See merge request pleroma/pleroma!17
eal [Tue, 14 Nov 2017 14:15:03 +0000 (16:15 +0200)]
Add links to API documentation.
eal [Tue, 14 Nov 2017 14:12:52 +0000 (16:12 +0200)]
TwitterAPI: Add unimplemented /mutes/users/ids.
eal [Tue, 14 Nov 2017 14:10:13 +0000 (16:10 +0200)]
TwitterAPI: Add unimplemented /friendships/no_retweets/ids.
lambda [Tue, 14 Nov 2017 14:09:36 +0000 (14:09 +0000)]
Merge branch 'mastoapi-media-timeline' into 'develop'
MastoAPI: Add media timelines.
Closes #63
See merge request pleroma/pleroma!16
eal [Tue, 14 Nov 2017 14:04:58 +0000 (16:04 +0200)]
TwitterAPI: Add /friends/ids.
eal [Tue, 14 Nov 2017 13:50:23 +0000 (15:50 +0200)]
Accept 1 as true.
eal [Tue, 14 Nov 2017 13:41:16 +0000 (15:41 +0200)]
MastoAPI: Add media timelines.
Roger Braun [Tue, 14 Nov 2017 08:34:28 +0000 (09:34 +0100)]
Update frontend.
Roger Braun [Mon, 13 Nov 2017 08:48:56 +0000 (09:48 +0100)]
MastoAPI: Fix repeat api bug.
Documentation was wrong, reblogging actually returns the reblog, not
the reblogged status.
Roger Braun [Sun, 12 Nov 2017 13:23:39 +0000 (14:23 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Roger Braun [Sun, 12 Nov 2017 13:23:05 +0000 (14:23 +0100)]
Add Mastodon frontend.
lambda [Sun, 12 Nov 2017 11:08:06 +0000 (11:08 +0000)]
Merge branch 'mastodon-notification-endpoints' into 'develop'
MastoAPI: Add notification endpoints get, clear and dismiss.
Closes #42
See merge request pleroma/pleroma!13
lambda [Sun, 12 Nov 2017 09:27:59 +0000 (09:27 +0000)]
Merge branch 'filetype-recognition' into 'develop'
Use headers for file content type recognition.
See merge request pleroma/pleroma!14
lambda [Sun, 12 Nov 2017 09:24:32 +0000 (09:24 +0000)]
Merge branch 'mastoapi-update-credentials' into 'develop'
MastoAPI: Add update credentials endpoint.
Closes #61
See merge request pleroma/pleroma!15
eal [Sat, 11 Nov 2017 23:16:46 +0000 (01:16 +0200)]
Add common video and audio types.
eal [Sat, 11 Nov 2017 22:27:09 +0000 (00:27 +0200)]
MastoAPI: Add update credentials endpoint.
eal [Sat, 11 Nov 2017 21:09:33 +0000 (23:09 +0200)]
Use headers for file content type recognition.
Roger Braun [Sat, 11 Nov 2017 19:00:11 +0000 (20:00 +0100)]
MastoAPI: Websocket streaming for federated timeline.
Roger Braun [Sat, 11 Nov 2017 13:59:25 +0000 (14:59 +0100)]
MastoAPI: Basic streaming.
Roger Braun [Sat, 11 Nov 2017 10:18:05 +0000 (11:18 +0100)]
MastoAPI: Fix reblog emojis.
Roger Braun [Fri, 10 Nov 2017 17:24:50 +0000 (18:24 +0100)]
Handle existing redirect params.
Roger Braun [Fri, 10 Nov 2017 16:37:54 +0000 (17:37 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Roger Braun [Fri, 10 Nov 2017 16:18:19 +0000 (17:18 +0100)]
MastoAPI: Use string ids everywhere.
eal [Fri, 10 Nov 2017 13:24:39 +0000 (15:24 +0200)]
MastoAPI: Add notification get, clear and dismiss.
Roger Braun [Thu, 9 Nov 2017 15:49:32 +0000 (16:49 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Roger Braun [Thu, 9 Nov 2017 15:48:45 +0000 (16:48 +0100)]
MastoAPI: Fetch statuses in search.
lambda [Thu, 9 Nov 2017 14:41:44 +0000 (14:41 +0000)]
Merge branch 'fix-tootdon-image-uploads' into 'develop'
Correct mimetype on bad uploads.
See merge request pleroma/pleroma!12
Roger Braun [Thu, 9 Nov 2017 14:16:10 +0000 (15:16 +0100)]
add sort index for activities
eal [Thu, 9 Nov 2017 12:11:37 +0000 (14:11 +0200)]
Correct mimetype on bad uploads.
Roger Braun [Thu, 9 Nov 2017 12:45:17 +0000 (13:45 +0100)]
Fix migration for empty db.
Roger Braun [Thu, 9 Nov 2017 12:32:53 +0000 (13:32 +0100)]
Update activities in own migration.
Roger Braun [Thu, 9 Nov 2017 11:33:38 +0000 (12:33 +0100)]
Update in chunks.
Roger Braun [Thu, 9 Nov 2017 09:41:19 +0000 (10:41 +0100)]
Add actor column to activities.
Roger Braun [Thu, 9 Nov 2017 07:32:54 +0000 (08:32 +0100)]
Re-fetch user data on salmon decode error.
lambda [Wed, 8 Nov 2017 17:57:13 +0000 (17:57 +0000)]
Merge branch 'following-you-in-user-view' into 'develop'
TwitterAPI user view: add follows_you.
See merge request pleroma/pleroma!11
eal [Wed, 8 Nov 2017 17:13:03 +0000 (19:13 +0200)]
TwitterAPI user view: add follows_you.
Roger Braun [Wed, 8 Nov 2017 16:25:18 +0000 (17:25 +0100)]
Look through whole db for user timelines.
They already have an index that's good enough.
Roger Braun [Wed, 8 Nov 2017 15:16:29 +0000 (16:16 +0100)]
Update frontend.
lambda [Wed, 8 Nov 2017 13:39:02 +0000 (13:39 +0000)]
Merge branch 'blocks-in-user-view' into 'develop'
TwitterAPI user view: add blocks.
See merge request pleroma/pleroma!10
eal [Wed, 8 Nov 2017 11:02:00 +0000 (13:02 +0200)]
TwitterAPI user view: add blocks.
lambda [Wed, 8 Nov 2017 10:35:23 +0000 (10:35 +0000)]
Merge branch 'twitter-api-blocks' into 'develop'
TwitterAPI: Add blocks.
See merge request pleroma/pleroma!9
eal [Tue, 7 Nov 2017 22:04:53 +0000 (00:04 +0200)]
TwitterAPI: Add blocks.
lambda [Tue, 7 Nov 2017 20:01:15 +0000 (20:01 +0000)]
Merge branch 'mastodon-emoji-endpoint' into 'develop'
Add mastodon API endpoint for custom emoji.
See merge request pleroma/pleroma!8
eal [Tue, 7 Nov 2017 19:28:31 +0000 (21:28 +0200)]
Add mastodon API endpoint for custom emoji.
lambda [Tue, 7 Nov 2017 18:58:22 +0000 (18:58 +0000)]
Merge branch 'authenticated-profile-fetching' into 'develop'
Allow profile fetching for authenticated users only.
Closes #54
See merge request pleroma/pleroma!7
Roger Braun [Tue, 7 Nov 2017 17:33:06 +0000 (18:33 +0100)]
Update frontend.
Roger Braun [Tue, 7 Nov 2017 17:27:08 +0000 (18:27 +0100)]
Update fronted.
Roger Braun [Tue, 7 Nov 2017 15:45:27 +0000 (16:45 +0100)]
Allow self-rt.
Roger Braun [Tue, 7 Nov 2017 11:06:37 +0000 (12:06 +0100)]
Linkify fixes.
Roger Braun [Tue, 7 Nov 2017 08:41:35 +0000 (09:41 +0100)]
Revert "Longer timeouts for user fetching."
Breaks too many tests.
This reverts commit
7de3a652147d9b7da9cf3fd82d8a8438df93bae8.
Roger Braun [Tue, 7 Nov 2017 08:11:19 +0000 (09:11 +0100)]
Longer timeouts for user fetching.
eal [Mon, 6 Nov 2017 22:33:44 +0000 (00:33 +0200)]
Allow profile fetching for authenticated users only.
lambda [Mon, 6 Nov 2017 20:27:31 +0000 (20:27 +0000)]
Merge branch 'fix-tootdon-oauth' into 'develop'
Fix tootdon logins.
See merge request pleroma/pleroma!6
eal [Mon, 6 Nov 2017 20:22:36 +0000 (22:22 +0200)]
Update README.
eal [Mon, 6 Nov 2017 19:51:31 +0000 (21:51 +0200)]
Fix tootdon logins.
Roger Braun [Sun, 5 Nov 2017 11:12:19 +0000 (12:12 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Roger Braun [Sun, 5 Nov 2017 11:05:25 +0000 (12:05 +0100)]
Fix bug when no posts are in the db.
lambda [Fri, 3 Nov 2017 08:56:44 +0000 (08:56 +0000)]
Merge branch 'feature/blocks' into 'develop'
Feature/blocks
See merge request pleroma/pleroma!5
projects / akkoma / log