Fix merge conflicts with upstream
[akkoma] / test / pleroma / web / activity_pub /
2021-06-04 Sean KingFix merge conflicts with upstream
2021-06-04 HaelwennMerge branch 'tests/openapi-everywhere' into 'develop'
2021-06-02 feldMerge branch 'Snow-develop-patch-01683' into 'develop'
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 feldMerge branch 'cycles-frontend-static' into 'develop'
2021-06-01 feldMerge branch 'cycles-base-url' into 'develop'
2021-06-01 HaelwennMerge branch 'features/validators-note' into 'develop'
2021-05-31 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-31 Alex GleasonDeprecate Pleroma.Web.base_url/0
2021-05-31 HaelwennMerge branch 'docs/goto-libera' into 'develop'
2021-05-30 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-28 feldMerge branch 'cycles-router-api-routes' into 'develop'
2021-05-28 feldMerge branch 'simplepolicy-announce-leak' into 'develop'
2021-05-28 feldMerge branch 'gitignore-runtime-exs' into 'develop'
2021-05-28 feldMerge branch 'alias-router-helpers' into 'develop'
2021-05-28 feldMerge branch 'plug-runtime-dev' into 'develop'
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-28 feldMerge branch 'cycles-router' into 'develop'
2021-05-28 feldMerge branch 'cycles-router-mediaproxy' into 'develop'
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-27 HaelwennMerge branch 'featured-totalItems' into 'develop'
2021-05-27 Mark FelderProvide totalItems field for featured collections
2021-05-19 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-19 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-18 feldMerge branch 'blurhash' into 'develop'
2021-05-16 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-16 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-14 Alex GleasonMerge remote-tracking branch 'upstream/attachment-meta...
2021-05-13 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-05-12 Alex GleasonIngest remote attachment width/height
2021-05-07 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-05-03 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-04-30 Alex GleasonSimplePolicy: filter string Objects
2021-04-30 Alex GleasonSimplePolicy: filter nested objects
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-04-29 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-04-16 rinpatchMerge branch 'features/ingestion-ecto-tag' into 'develop'
2021-04-16 rinpatchMerge branch 'feature/521-pinned-post-federation' into...
2021-04-16 rinpatchMerge branch 'fix/2593-reading-exported-config-file...
2021-04-05 Haelwenn (lanodan... utils: Fix maybe_splice_recipient when "object" isn...
2021-04-05 Haelwenn (lanodan... NoteHandlingTest: remove fix_explicit_addressing-relate...
2021-04-05 Haelwenn (lanodan... ActivityPubControllerTest: Apply same addr changes...
2021-04-05 Haelwenn (lanodan... recipients fixes/hardening for CreateGenericValidator
2021-04-05 Haelwenn (lanodan... Pipeline Ingestion: Note
2021-04-05 Haelwenn (lanodan... ObjectValidator.CommonFixes: Introduce fix_objects_defa...
2021-04-05 Haelwenn (lanodan... Transmogrifier: Simplify fix_explicit_addressing and...
2021-04-01 Haelwenn (lanodan... pipeline_test: Fix usage of %Activity{}
2021-04-01 rinpatchMerge branch 'refactor/object_validator_validate' into...
2021-03-30 feldMerge branch 'upstream/mrf-followbot' into 'develop'
2021-03-30 Mark FelderFix function calls due to module name change
2021-03-30 Mark FelderTemp file leaked, oops
2021-03-30 Mark FelderPrefer FollowBot naming convention vs Followbot
2021-03-30 Mark FelderMore tests to validate Followbot is behaving
2021-03-30 Mark FelderOnly need to validate a follow request is generated...
2021-03-25 Alexander Strizhakovseparate test file for featured collection
2021-03-25 Alexander Strizhakovmoving fixture into mastodon folder
2021-03-25 Alexander Strizhakovrefetch user on incoming add/remove activity
2021-03-25 Alexander Strizhakovfeatured_address valition in AddRemoveValidator
2021-03-25 Alexander Strizhakovvalidator renaming & add validation for target
2021-03-25 Alexander Strizhakovmastodon pins
2021-03-25 Alexander StrizhakovLet pins federate
2021-03-21 rinpatchMerge branch 'richmedia-workaround' into 'develop'
2021-03-19 rinpatchMerge branch 'mediaproxy-decode' into 'develop'
2021-03-19 rinpatchMerge branch 'fix/remove_auto_nsfw' into 'develop'
2021-03-19 rinpatchMerge branch 'bugfix/bridgy-user-icon' into 'develop'
2021-03-16 HaelwennMerge branch 'update_open_api_spex' into 'develop'
2021-03-15 rinpatchMerge branch 'feature/object-hashtags-rework' into...
2021-03-15 Haelwenn (lanodan... Add support for actor icon being a list (Bridgy)
2021-03-12 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-03-10 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-03-07 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-03-03 Ivan Tashkinov[#3213] ActivityPub hashtags filtering refactoring...
2021-03-02 lainMerge branch 'release/2.3.0' into 'stable'
2021-03-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-03-01 HaelwennMerge branch 'application-to-generator' into 'develop'
2021-03-01 Mark FelderStore application details in the object under the gener...
2021-02-28 lainMerge branch 'features/reports-enhancements' into ...
2021-02-28 lainMerge branch 'admin-api-versioning' into 'develop'
2021-02-28 lainMerge branch 'bugfix/peertube-mpegURL-object' into...
2021-02-28 lainMerge branch 'feat/client_app_details' into 'develop'
2021-02-27 Haelwenn (lanodan... Remove sensitive-property setting #nsfw, create Hashtag...
2021-02-27 Mark FelderStore the client application data in ActivityStreams...
2021-02-26 feldMerge branch 'ecto-rollback-in-test-env' into 'develop'
2021-02-24 HaelwennMerge branch 'docfix/chat-token' into 'develop'
2021-02-23 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-02-23 Ivan Tashkinov[#3213] Misc. tweaks: proper upsert in Hashtag, better...
2021-02-21 Haelwenn (lanodan... Video: Handle peertube videos only stashing attachments...
2021-02-17 rinpatchMerge branch '2510-oauth-app-tokens-further-support...
2021-02-16 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-02-15 Ivan Tashkinov[#3213] Fixed `hashtags.name` lookup (must use `citext...
next