Commit Graph

426 Commits (15cb3f2b01dfd914fa414174602ad03b41dfa768)

Author SHA1 Message Date
Roger Braun ad0ab3a57b Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
7 years ago
Roger Braun 4501094606 Make specs less breaky.
7 years ago
Roger Braun 1bb3ba02f3 Fix specs.
7 years ago
eal b3e7d7ae6d Fetch external profile in the background.
7 years ago
eal 80f6ac412a Merge branch 'default-pictures' into 'develop'
7 years ago
eal 14b086eec2 Add a default profile picture and banner.
7 years ago
eal 6e1cb86166 Fix instance test.
7 years ago
Lain Iwakura 2a744cdff8 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
Lain Iwakura f1f79c0dca Fix timelines in subway tooter.
7 years ago
lambda 29c9812789 Merge branch 'fix/twitterapi-follow-lists' into 'develop'
7 years ago
Lain Iwakura 47887ac848 MastoAPI: Fix always-sensitive bugs.
7 years ago
eal 1969773fb4 Fix follower/following lists.
7 years ago
eal 9223038319 Fix some more tests.
7 years ago
eal 79b3397c17 Fix tests.
7 years ago
Roger Braun d5a13c10ac Merge branch 'feature/user_deletion' into develop
7 years ago
Lain Iwakura bad499b3fd Basic user deletion.
7 years ago
eal a3e68f0233 Allow parentheses in links.
7 years ago
Lain Iwakura 6df6ad0b42 User deletion: Remove relationships.
7 years ago
Lain Iwakura a78ae2a685 Don't follow deactivated users.
7 years ago
Lain Iwakura b727ecc5e7 Add function to deactivate users.
7 years ago
Lain Iwakura 0ec5aeb8a7 Don't log in deactivated users.
7 years ago
Lain Iwakura 66c3813ea6 Add basic queue prioritization.
7 years ago
Lain Iwakura e7c2472abd Fix tests.
7 years ago
Roger Braun d08a34e88b OStatus: Add user bio as summary field
7 years ago
Lain Iwakura 5637d163e6 MastodonAPI: Add proper user count.
7 years ago
Lain Iwakura c680ae581d Return xml notice at /notice path.
7 years ago
eal 1625021a9c Merge branch 'fix/self-follow' into 'develop'
7 years ago
eal 3d29fc5462 Make /api/friends/ids test deterministic.
7 years ago
Roger Braun 747a68a075 Treat internal emoji like external.
7 years ago
eal 8d4e7b32c9 Ensure correct state in self-unfollow.
7 years ago
eal bd921ca5d7 Fix posts being streamed to non-local websocket channels.
7 years ago
eal edc3e5bc30 Make users in tests follow themselves by default.
7 years ago
eal 4db5954786 Don't let the user unfollow their own account.
7 years ago
Roger Braun 40ca379357 Fix flakey test.
7 years ago
lambda ed3403ad8b Merge branch 'formatting-fixes' into 'develop'
7 years ago
eal f53cdabcdf Add #nsfw tag if sensitive content bit is set
7 years ago
eal fb118b2978 Don't insert newlines to generated HTML.
7 years ago
eal 66e78c3ec4 Escape HTML instead of discarding it.
7 years ago
Roger Braun a743940463 MastoAPI: Implement all streaming functions.
7 years ago
Roger Braun ced0d64d75 MastoAPI: Make attachment ids strings.
7 years ago
lambda 1cca544e20 Merge branch 'twitterapi-bitlbee' into 'develop'
7 years ago
eal f9828e578c TwitterAPI: Add /users/show.
7 years ago
eal 3533bf7eac TwitterAPI: Add /friends/ids.
7 years ago
eal 06c3ee3bac Accept 1 as true.
7 years ago
eal c84723b679 MastoAPI: Add media timelines.
7 years ago
Roger Braun 083cd169d2 MastoAPI: Fix repeat api bug.
7 years ago
lambda 08bc316742 Merge branch 'mastodon-notification-endpoints' into 'develop'
7 years ago
lambda efcf54dc02 Merge branch 'mastoapi-update-credentials' into 'develop'
7 years ago
eal fc7483cb3c MastoAPI: Add update credentials endpoint.
7 years ago
Roger Braun a1923d20e8 MastoAPI: Fix reblog emojis.
7 years ago