Commit Graph

460 Commits (18c3ca784427ad5e5f015c76c157697671d00fd4)

Author SHA1 Message Date
lain 4816b09fa7 Add user upgrade function.
7 years ago
lain 94db9ac4db Merge branch 'develop' into feature/activitypub
7 years ago
lain 810cf8618f ActivityPub: Fetch missing activities on reply.
7 years ago
lain 5bc810c452 Add moderator function.
7 years ago
lain 95f7e7e2d5 Add some more tests.
7 years ago
lain 297a2c7d3f Ignore duplicate create activities.
7 years ago
lain 6b6ab592ab AP: Fix incoming conversations.
7 years ago
lain 539340d914 Handle sensitive property.
7 years ago
lain 20e6190ead Transmogrify outgoing nsfw.
7 years ago
lain 8ca66b5961 ActivityPub: Add conversation id.
7 years ago
lain 6ab0aba50a Transmogrify outgoing hashtags.
7 years ago
lain 6046f10431 Actually fix incoming attachments.
7 years ago
lain 77c6c424a6 ActivityPub: Make fake Create activities for objects without one.
7 years ago
lain 81ea359a7c ActivityPub: Handle incoming announces.
7 years ago
lain 5e36b750c1 ActivityPub: Fetch an object from an id.
7 years ago
lain e1b12a7782 ActivityPub: Handle incoming likes.
7 years ago
lain e7b73359e3 ActivityPub: Partly handle incoming follows.
7 years ago
lain 5682e48a25 ActivityPub: tags -> tag.
7 years ago
lain 05ba6ca1b8 Do some transmogrifying for the output.
7 years ago
lain 5454ec6a6c ActivityPubController: Handle inbox data.
7 years ago
lain ef0300889d Transmogrifier: Handle basic notice creation.
7 years ago
lain a15f572800 OstatusTest: Remove insert_or_update test (moved to User).
7 years ago
lain ae26604378 ActivityPub: Refactor create function.
7 years ago
lain b331cb449a Merge branch 'develop' into feature/activitypub
7 years ago
lain 26ccb768d3 Make test output easier to read.
7 years ago
lain 33a5d0a238 Fix some test warnings.
7 years ago
lain 3c80d9b277 Fix spec.
7 years ago
lain 8cf97ee8e1 ActivityPub: Basic note federation with Mastodon.
7 years ago
lain ce31f3a922 Twitter Representers: Handle Mastodon attachments.
7 years ago
Roger Braun ae1ec858f4 Basic AP user building.
7 years ago
Roger Braun 52200998c9 Merge branch 'develop' into feature/activitypub
7 years ago
lambda 61c16193de Merge branch 'move-backend-images' into 'develop'
7 years ago
Hakaba Hitoyo ea6d1b2b17 move avi.png & banner.png from /priv/static/static to /priv/static/images
7 years ago
eal 29be70c008 Add remote following of local profiles.
7 years ago
eal ab83e0de6d TwitterAPI: Add is_local to user view.
7 years ago
Roger Braun ad0ab3a57b Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
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
Lain Iwakura 4a13b84887 Add recipients field to activities.
7 years ago
eal 9223038319 Fix some more tests.
7 years ago
Lain Iwakura e2e6365035 ActivityPub: Add controller tests.
7 years ago
Lain Iwakura da005d3332 ActivityPub: Add Objects View.
7 years ago
eal 79b3397c17 Fix tests.
7 years ago
Roger Braun c3bcafc51b HTTPSig: Add method to validate conn
7 years ago
Roger Braun 30e9b22f96 Merge branch 'develop' into feature/activitypub
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 3d29fc5462 Make /api/friends/ids test deterministic.
7 years ago
Roger Braun 747a68a075 Treat internal emoji like external.
7 years ago
eal edc3e5bc30 Make users in tests follow themselves by default.
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 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
Roger Braun 1d3d66a841 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
Roger Braun 6e9c22c0af MastoAPI: Use string ids everywhere.
7 years ago
eal e6a78c6ed0 MastoAPI: Add notification get, clear and dismiss.
7 years ago
Roger Braun 266d9c008d MastoAPI: Fetch statuses in search.
7 years ago
Roger Braun f1d27a5fbb Add actor column to activities.
7 years ago
Roger Braun 41b8a76e96 Re-fetch user data on salmon decode error.
7 years ago
eal f7fc048aeb TwitterAPI user view: add follows_you.
7 years ago
eal 4656cb9b99 TwitterAPI user view: add blocks.
7 years ago
eal 6c0758e041 TwitterAPI: Add blocks.
7 years ago
eal f85566324e Allow profile fetching for authenticated users only.
7 years ago
Roger Braun 7252f6b054 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
Roger Braun 046bee34d3 Fix bug when no posts are in the db.
7 years ago
Roger Braun c6b9b777da MastoAPI: Add list of blocked users.
7 years ago
Roger Braun 5bf92e50be MastoAPI: Add blocking.
7 years ago
Roger Braun 33beb51da4 MastoAPI: Add blocking to AccountView.
7 years ago
Roger Braun 867ac1e4f5 Handle nil cases.
7 years ago
Roger Braun 8ef58a266b Don't return blocked users' activities in contexts.
7 years ago
Roger Braun a47727adde Don't return activities from blocked users.
7 years ago
Roger Braun 6f05367325 Federate out content warnings.
7 years ago
Roger Braun e014cc6ed8 Allow using cws in mastodon api.
7 years ago
Roger Braun 0c871e5c6e Fix specs.
7 years ago
Roger Braun 44295dd49a MastoAPI: Include CW.
7 years ago
Roger Braun 04217f52c9 TwitterAPI: Display cws.
7 years ago