52200998c9
Merge branch 'develop' into feature/activitypub
7 years ago
61c16193de
Merge branch 'move-backend-images' into 'develop'
...
Move avi.png & banner.png from /priv/static/static to /priv/static/images
See merge request pleroma/pleroma!60
7 years ago
ea6d1b2b17
move avi.png & banner.png from /priv/static/static to /priv/static/images
7 years ago
29be70c008
Add remote following of local profiles.
7 years ago
ab83e0de6d
TwitterAPI: Add is_local to user view.
7 years ago
ad0ab3a57b
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
7 years ago
4501094606
Make specs less breaky.
7 years ago
1bb3ba02f3
Fix specs.
7 years ago
b3e7d7ae6d
Fetch external profile in the background.
7 years ago
80f6ac412a
Merge branch 'default-pictures' into 'develop'
...
Add a default profile picture and banner.
See merge request pleroma/pleroma!48
7 years ago
14b086eec2
Add a default profile picture and banner.
...
This removes the placehold.it dependency.
7 years ago
6e1cb86166
Fix instance test.
7 years ago
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
1969773fb4
Fix follower/following lists.
...
Add tests.
7 years ago
4a13b84887
Add recipients field to activities.
...
Also do some very basic checks for AP message insertion.
7 years ago
9223038319
Fix some more tests.
7 years ago
e2e6365035
ActivityPub: Add controller tests.
7 years ago
da005d3332
ActivityPub: Add Objects View.
7 years ago
79b3397c17
Fix tests.
7 years ago
c3bcafc51b
HTTPSig: Add method to validate conn
7 years ago
30e9b22f96
Merge branch 'develop' into feature/activitypub
7 years ago
d5a13c10ac
Merge branch 'feature/user_deletion' into develop
7 years ago
bad499b3fd
Basic user deletion.
7 years ago
a3e68f0233
Allow parentheses in 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
66c3813ea6
Add basic queue prioritization.
7 years ago
e7c2472abd
Fix tests.
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
c680ae581d
Return xml notice at /notice path.
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
3d29fc5462
Make /api/friends/ids test deterministic.
7 years ago
747a68a075
Treat internal emoji like external.
7 years ago
8d4e7b32c9
Ensure correct state in self-unfollow.
7 years ago
bd921ca5d7
Fix posts being streamed to non-local websocket channels.
7 years ago
edc3e5bc30
Make users in tests follow themselves by default.
...
Also fix the semantics of all tests to match.
7 years ago
4db5954786
Don't let the user unfollow their own account.
7 years ago
40ca379357
Fix flakey test.
7 years ago
ed3403ad8b
Merge branch 'formatting-fixes' into 'develop'
...
Formatting fixes
Closes #80
See merge request pleroma/pleroma!22
7 years ago
f53cdabcdf
Add #nsfw tag if sensitive content bit is set
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
a743940463
MastoAPI: Implement all streaming functions.
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
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
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
efcf54dc02
Merge branch 'mastoapi-update-credentials' into 'develop'
...
MastoAPI: Add update credentials endpoint.
Closes #61
See merge request pleroma/pleroma!15
7 years ago
fc7483cb3c
MastoAPI: Add update credentials endpoint.
7 years ago
a1923d20e8
MastoAPI: Fix reblog emojis.
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
f7fc048aeb
TwitterAPI user view: add follows_you.
7 years ago
4656cb9b99
TwitterAPI user view: add blocks.
7 years ago
6c0758e041
TwitterAPI: Add blocks.
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
7da978f3f5
Linkify fixes.
7 years ago
f85566324e
Allow profile fetching for authenticated users only.
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
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
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
345ad870f7
Clean up user_test.exs.
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
0c871e5c6e
Fix specs.
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
968a546d4a
MastoAPI: Return id as string instead of integer.
7 years ago
2f39bb6b43
Typo.
7 years ago
ce7f9f527c
MastoAPI: Always return an url for statuses.
...
External url if available, id if not.
7 years ago
502cb38cd6
Move user search to User module.
7 years ago
71f66bd458
Fix follow test semantics.
7 years ago
c56d28f96c
Fix return type of /api/v1/follows
7 years ago
Roger Braun