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