2a744cdff8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
f1f79c0dca
Fix timelines in subway tooter.
7 years ago
29c9812789
Merge branch 'fix/twitterapi-follow-lists' into 'develop'
...
Fix follower/following lists.
Closes #29
See merge request pleroma/pleroma!41
7 years ago
47887ac848
MastoAPI: Fix always-sensitive bugs.
7 years ago
846d59a536
Send out salmons before websub.
7 years ago
1969773fb4
Fix follower/following lists.
...
Add tests.
7 years ago
6b48489237
Merge branch 'feature/follow-import' into 'develop'
...
Add follow import.
See merge request pleroma/pleroma!40
7 years ago
fdfb508259
Run follow import in the background.
7 years ago
d89193a8d7
Allow uploading a file for follow import.
7 years ago
4a13b84887
Add recipients field to activities.
...
Also do some very basic checks for AP message insertion.
7 years ago
39ccfdc084
Add follow import.
7 years ago
f909aec050
proxy emojis
...
(i fix emojos better than gargon but sshhhhh)
7 years ago
8e82547179
fix content-type and fallback to image/jpeg
7 years ago
888ec9e579
ActivityPub: Check inbox requests for valid signature.
7 years ago
a9c23e1c32
Add plug to validate signed http requests.
7 years ago
64330d9455
ActivityPub: Add object routes / controller.
7 years ago
a89a613e4e
ActivityPub: Use only string keys in views.
7 years ago
da005d3332
ActivityPub: Add Objects View.
7 years ago
4b06e46a3a
Merge branch 'fix/tootdon-mentions' into 'develop'
...
Fix Tootdon linking the whole status when mentioning someone.
See merge request pleroma/pleroma!39
7 years ago
b00e230760
Add a bunch of useless HTML to mentions.
7 years ago
c3bcafc51b
HTTPSig: Add method to validate conn
7 years ago
5599c5920c
Basic incoming AP support.
7 years ago
9093b2cf49
Merge remote-tracking branch 'upstream/develop' into media-proxy
7 years ago
077faaed8c
Limit body size to 25MB
7 years ago
25118aeef7
Add link to AP address in webfinger.
7 years ago
30e9b22f96
Merge branch 'develop' into feature/activitypub
7 years ago
d5a13c10ac
Merge branch 'feature/user_deletion' into develop
7 years ago
ef2322bdb7
Delete notifications on activity deletion.
7 years ago
bad499b3fd
Basic user deletion.
7 years ago
35cfbf43a0
Merge branch 'fix/linkify' into 'develop'
...
Fix links with HTML elements and/or parentheses.
See merge request pleroma/pleroma!38
7 years ago
a3e68f0233
Allow parentheses in links.
7 years ago
bf91e5659f
Fix HTML escape breaking some links.
7 years ago
5436dbaeaf
MastoAPI: don't add attachment links.
7 years ago
6df6ad0b42
User deletion: Remove relationships.
7 years ago
a78ae2a685
Don't follow deactivated users.
7 years ago
b727ecc5e7
Add function to deactivate users.
7 years ago
0ec5aeb8a7
Don't log in deactivated users.
7 years ago
e31a5ff4af
Priority queue fixes.
7 years ago
66c3813ea6
Add basic queue prioritization.
7 years ago
72f7baa654
Merge remote-tracking branch 'upstream/develop' into media-proxy
7 years ago
1c90bfb4f6
Merge remote-tracking branch 'origin/develop' into feature/chat
7 years ago
5945ec84e9
Don't save user in socket, just save the name.
7 years ago
69f1024bb0
Add basic channel state.
7 years ago
c1fa1e8844
Fix basic auth for passwords with a colon.
7 years ago
5c40986120
Basic backend chat.
7 years ago
d08a34e88b
OStatus: Add user bio as summary field
...
Fixes problem with bio federation.
7 years ago
5637d163e6
MastodonAPI: Add proper user count.
7 years ago
1cb5cbdc6c
Improve error handling, add configuration
7 years ago
e28c110eba
mandatory typo fix...
7 years ago
5f35fdcf5d
media proxy: good enough wip
7 years ago
9d1c0ec18d
Merge branch 'salmon-native-keys' into 'develop'
...
Salmon: generate private key with native crypto if available.
See merge request pleroma/pleroma!33
7 years ago
4524721fba
Salmon: generate private key with native crypto if available.
7 years ago
c680ae581d
Return xml notice at /notice path.
7 years ago
d16b613929
MastodonUI login: Show error message on error.
7 years ago
698a75cb39
Merge branch 'develop' into 'develop'
...
Pleroma-Dark default theme for the Mastodon Frontend
See merge request pleroma/pleroma!27
7 years ago
1625021a9c
Merge branch 'fix/self-follow' into 'develop'
...
Dont include the user in their own follower count.
See merge request pleroma/pleroma!29
7 years ago
e9037ffc8d
Do not include user in their own follower count.
7 years ago
fa19de97ba
MastoAPI: no more than 4 attachments.
7 years ago
747a68a075
Treat internal emoji like external.
7 years ago
cf0bbf320d
MastoAPI: Add max_toot_chars.
7 years ago
bd921ca5d7
Fix posts being streamed to non-local websocket channels.
7 years ago
4db5954786
Don't let the user unfollow their own account.
7 years ago
aadf54e0df
Don't show the user in their own following count.
7 years ago
36011fee4e
Add Custom Pleroma-dark theme
7 years ago
52aa65fe6e
Federator Queue: Add seperate in/out queues.
7 years ago
5ff5d583b6
MastodonAPI: Streaming fixes.
...
Now shows repeats in the home tl.
7 years ago
0f099dac67
MastodonAPI: Add sign out.
...
Close #79
7 years ago
c336a13d2c
MastoAPI: Only return create activties in contexts.
7 years ago
59770c3f5c
Fix all compilation warnings
7 years ago
ed3403ad8b
Merge branch 'formatting-fixes' into 'develop'
...
Formatting fixes
Closes #80
See merge request pleroma/pleroma!22
7 years ago
146ec80285
Merge branch 'fix/mastofe-login-redirect' into 'develop'
...
Redirect to Getting Started on login.
See merge request pleroma/pleroma!21
7 years ago
f53cdabcdf
Add #nsfw tag if sensitive content bit is set
7 years ago
31e4277ba5
Don't add summary if empty.
7 years ago
fb118b2978
Don't insert newlines to generated HTML.
...
MastoFE doesn't like them.
7 years ago
66e78c3ec4
Escape HTML instead of discarding it.
7 years ago
4647bcd6e6
Don't start streamer during tests.
7 years ago
9c60cc88df
Redirect to Getting Started on login.
7 years ago
a743940463
MastoAPI: Implement all streaming functions.
7 years ago
5719f69ae3
MastodonAPI: Stream fixes.
7 years ago
43499848d0
Small css fix.
7 years ago
189513e4ff
Add styles to make login page resemble mastodon's
7 years ago
8de890a0d9
Add custom emoji to Mastodon UI initial state.
7 years ago
ced0d64d75
MastoAPI: Make attachment ids strings.
7 years ago
1cca544e20
Merge branch 'twitterapi-bitlbee' into 'develop'
...
TwitterAPI: Add missing endpoints for bitlbee.
Closes #67
See merge request pleroma/pleroma!18
7 years ago
f9828e578c
TwitterAPI: Add /users/show.
7 years ago
163c658202
TwitterAPI: Add unimplemented /mutes/users/ids.
7 years ago
22bbe27115
TwitterAPI: Add unimplemented /friendships/no_retweets/ids.
7 years ago
3533bf7eac
TwitterAPI: Add /friends/ids.
7 years ago
06c3ee3bac
Accept 1 as true.
7 years ago
c84723b679
MastoAPI: Add media timelines.
7 years ago
083cd169d2
MastoAPI: Fix repeat api bug.
...
Documentation was wrong, reblogging actually returns the reblog, not
the reblogged status.
7 years ago
5fc6e9d467
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
d293ceb1b5
Add Mastodon frontend.
7 years ago
08bc316742
Merge branch 'mastodon-notification-endpoints' into 'develop'
...
MastoAPI: Add notification endpoints get, clear and dismiss.
Closes #42
See merge request pleroma/pleroma!13
7 years ago
87dee3902a
Merge branch 'filetype-recognition' into 'develop'
...
Use headers for file content type recognition.
See merge request pleroma/pleroma!14
7 years ago
efcf54dc02
Merge branch 'mastoapi-update-credentials' into 'develop'
...
MastoAPI: Add update credentials endpoint.
Closes #61
See merge request pleroma/pleroma!15
7 years ago
18a95cd375
Add common video and audio types.
7 years ago
fc7483cb3c
MastoAPI: Add update credentials endpoint.
7 years ago
260b148b92
Use headers for file content type recognition.
7 years ago
414c52509b
MastoAPI: Websocket streaming for federated timeline.
7 years ago
bd5bdc4c24
MastoAPI: Basic streaming.
7 years ago
a1923d20e8
MastoAPI: Fix reblog emojis.
7 years ago
fd12e585c9
Handle existing redirect params.
7 years ago
1d3d66a841
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
6e9c22c0af
MastoAPI: Use string ids everywhere.
7 years ago
e6a78c6ed0
MastoAPI: Add notification get, clear and dismiss.
7 years ago
1b8ad9f731
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
266d9c008d
MastoAPI: Fetch statuses in search.
7 years ago
2247d7580e
Merge branch 'fix-tootdon-image-uploads' into 'develop'
...
Correct mimetype on bad uploads.
See merge request pleroma/pleroma!12
7 years ago
e942e1e552
Correct mimetype on bad uploads.
7 years ago
f1d27a5fbb
Add actor column to activities.
7 years ago
41b8a76e96
Re-fetch user data on salmon decode error.
7 years ago
77e272df2d
Merge branch 'following-you-in-user-view' into 'develop'
...
TwitterAPI user view: add follows_you.
See merge request pleroma/pleroma!11
7 years ago
f7fc048aeb
TwitterAPI user view: add follows_you.
7 years ago
d2430d5007
Look through whole db for user timelines.
...
They already have an index that's good enough.
7 years ago
4656cb9b99
TwitterAPI user view: add blocks.
7 years ago
6c0758e041
TwitterAPI: Add blocks.
7 years ago
be67db5547
Merge branch 'mastodon-emoji-endpoint' into 'develop'
...
Add mastodon API endpoint for custom emoji.
See merge request pleroma/pleroma!8
7 years ago
c6210183e1
Add mastodon API endpoint for custom emoji.
7 years ago
d761b1543a
Merge branch 'authenticated-profile-fetching' into 'develop'
...
Allow profile fetching for authenticated users only.
Closes #54
See merge request pleroma/pleroma!7
7 years ago
722c4614ad
Allow self-rt.
7 years ago
7da978f3f5
Linkify fixes.
7 years ago
6dfa62800a
Revert "Longer timeouts for user fetching."
...
Breaks too many tests.
This reverts commit 7de3a65214
7 years ago
7de3a65214
Longer timeouts for user fetching.
7 years ago
f85566324e
Allow profile fetching for authenticated users only.
7 years ago
ed1eb5deea
Merge branch 'fix-tootdon-oauth' into 'develop'
...
Fix tootdon logins.
See merge request pleroma/pleroma!6
7 years ago
b0e27b21dd
Fix tootdon logins.
7 years ago
7252f6b054
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
046bee34d3
Fix bug when no posts are in the db.
7 years ago
fa1f11e8e9
Merge branch 'feature/blocks' into 'develop'
...
Feature/blocks
See merge request pleroma/pleroma!5
7 years ago
c6b9b777da
MastoAPI: Add list of blocked users.
7 years ago
5bf92e50be
MastoAPI: Add blocking.
7 years ago
33beb51da4
MastoAPI: Add blocking to AccountView.
7 years ago
8a1a7191fd
MastoAPI: Fix mentions always being for an anonymous user.
7 years ago
9b63647aff
MastoApi: Add blocking to fetches.
7 years ago
d89a7a0b34
TwitterAPI: Add blocking to fetches.
7 years ago
867ac1e4f5
Handle nil cases.
7 years ago
8ef58a266b
Don't return blocked users' activities in contexts.
7 years ago
a47727adde
Don't return activities from blocked users.
7 years ago
632da6c927
Don't create notifications if the user is blocked.
7 years ago
6a5f087174
Add blocks to User.
7 years ago
9be286a900
Handle empty terms / tags.
7 years ago
6f05367325
Federate out content warnings.
7 years ago
e014cc6ed8
Allow using cws in mastodon api.
7 years ago
44295dd49a
MastoAPI: Include CW.
7 years ago
04217f52c9
TwitterAPI: Display cws.
7 years ago
4cbf17dac6
Save cws in the activitypub data.
7 years ago
4dcbb64f19
Avoid potentially slow count queries for user note count.
...
For a variety of reasons, posgresql won't use the available actor,
type index to do an index only scan. We now just increase the user
note count, which will lead to slightly wrong counts in some cases,
but it's better than the potentially very slow count query.
7 years ago
3037814fde
Only search through last 100_000 activities for fetches.
...
This is purely a performance enhancement
7 years ago
968a546d4a
MastoAPI: Return id as string instead of integer.
7 years ago
Lain Iwakura