a304a2a845
Merge branch 'transmogrifier-test-errors' into 'develop'
...
capture test log where errors are expected
See merge request pleroma/pleroma!1915
5 years ago
556da92902
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
...
Store status data inside flag activity
See merge request pleroma/pleroma!1849
5 years ago
c2f2d7bcf6
Add test follow activity for locked account
5 years ago
56e42602b0
capture where errors are expected
5 years ago
2480200759
Merge branch 'refactor/following-relationships' into 'develop'
...
Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814
5 years ago
8282b6ac3d
Make sure incoming flags are updated with status data
5 years ago
791bcfd90f
Merge branch 'develop' into feature/store-statuses-data-inside-flag
5 years ago
5329b361ec
fix test
5 years ago
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
b08b1d5d91
Store status data inside Flag activity
5 years ago
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
5 years ago
277aea45b9
tests: transmogrifier: add explicit regression tests for JSON-LD string to single-element array deserialization
...
There appears to be confusion on whether or not Pleroma can handle this particular
sin of JSON-LD. It can, and we will add regression tests to prove that it can handle
this particular sin. Which, by the way, this is actually not a "feature" of JSON-LD,
but whatever.
5 years ago
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
c6fdfbc4f1
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
5 years ago
dbfdb1f6e3
add some missing tesla fixtures
5 years ago
d379b48769
kill almost all of the OStatus module
5 years ago
4f82e42e4e
websub: remove entirely
5 years ago
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
37812740c4
Transmogrifier: Correctly save incoming ids for Accept/Reject.
5 years ago
9b963064eb
Transmogrifier: Actually store who deleted a note.
5 years ago
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
29647dfd09
Transmogrifier: Save correct ids for incoming deletes.
5 years ago
45b7f03f89
Merge branch 'accept-embedded-announce-object' into 'develop'
...
Import object from self-Announce whenever possible
See merge request pleroma/pleroma!1770
5 years ago
4b8524f392
ActivityPub / Transmogrifier: Correctly store incoming Update id.
5 years ago
b1ff66dc5f
Add test for handling Announces with inlined object from different origin
5 years ago
977e711e22
Import object from self-Announce whenever possible
5 years ago
1c6e1055c8
Add CustomEmojiController
5 years ago
86880b9821
Inline object when Announcing a self-owned private object
5 years ago
dae744478e
Transmogrifier: Handle compact objects in undos.
5 years ago
c55facf78b
Fix warning in TransmogrifierTest
5 years ago
71eff09e56
common api: make sure the generated IR is actually federatable
5 years ago
e7309d3b60
test: transmogrifier: add test proving that transmogrifier can handle outgoing listens
5 years ago
172c74a77b
activitypub: transmogrifier: implement support for Listen activities
5 years ago
d4ed3a35b8
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
5 years ago
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
5 years ago
2b40e57a72
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
102eb4455c
Fix associated test as well
5 years ago
007e0c1ce1
added tests
5 years ago
fcf604fa43
added tests
5 years ago
a31af93e1d
added tests /activity_pub/transmogrifier.ex
5 years ago
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
5 years ago
d74efde94e
Update test for custom profile fields
5 years ago
7101ba1a21
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
256ff09aa8
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
5 years ago
85bd8a4e31
fixed clear config after test
5 years ago
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
e457fcc479
Add `:max_remote_account_fields` config option
5 years ago
f7bbf99caa
Use info.fields instead of source_data for remote users
5 years ago
5178f960c3
Support user attachment update in Transmogrifier
5 years ago
lain