projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Resolve conflicts
[akkoma]
/
test
/
web
/
activity_pub
/
2019-06-28
Roman Chvanikov
Resolve conflicts
tree
|
commitdiff
2019-06-28
lain
Merge branch 'release-docs' into 'develop'
tree
|
commitdiff
2019-06-26
rinpatch
Merge branch 'update-mastofe/glitch-soc-2019-06-26...
tree
|
commitdiff
2019-06-23
kaniini
Merge branch 'bind-to-localhost' into 'develop'
tree
|
commitdiff
2019-06-23
kaniini
Merge branch 'rich_media_titles_two' into 'develop'
tree
|
commitdiff
2019-06-23
kaniini
Merge branch 'admin-config' into 'develop'
tree
|
commitdiff
2019-06-23
Alex S
log capturing
tree
|
commitdiff
2019-06-22
rinpatch
Merge branch 'mix_sem_ver_version_fix' into 'develop'
tree
|
commitdiff
2019-06-21
rinpatch
Merge branch 'develop' into release-docs
tree
|
commitdiff
2019-06-21
kaniini
Merge branch 'feature/mrf-anti-link-spam' into 'develop'
tree
|
commitdiff
2019-06-19
William Pitcock
unbreak polls
tree
|
commitdiff
2019-06-19
William Pitcock
implement anti link spam MRF
tree
|
commitdiff
2019-06-17
rinpatch
Merge branch 'removing-test-errors' into 'develop'
tree
|
commitdiff
2019-06-16
Alex S
capturing errors
tree
|
commitdiff
2019-06-11
lain
Merge branch 'feature/rate-limiter' into 'develop'
tree
|
commitdiff
2019-06-11
kaniini
Merge branch 'change-containment-default' into 'develop'
tree
|
commitdiff
2019-06-11
kaniini
Merge branch 'preload-changes' into 'develop'
tree
|
commitdiff
2019-06-09
rinpatch
Merge branch 'develop' into feature/releases
tree
|
commitdiff
2019-06-08
lain
Merge branch 'prod-loglevel-warn' into 'develop'
tree
|
commitdiff
2019-06-08
lain
Merge branch 'fix/transmogrifier-inReplyTo' into 'develop'
tree
|
commitdiff
2019-06-07
rinpatch
replace missing mock with a 404
tree
|
commitdiff
2019-06-07
rinpatch
Transmogrifier: Do not crash if inReplyTo does not...
tree
|
commitdiff
2019-06-06
Roman Chvanikov
Resolve conflicts
tree
|
commitdiff
2019-06-05
kaniini
Merge branch 'bugfix/377-stuck-follow-request' into...
tree
|
commitdiff
2019-06-05
kaniini
Merge branch 'improve-search' into 'develop'
tree
|
commitdiff
2019-06-05
lain
Utils: Split update_follow_state and update_follow_stat...
tree
|
commitdiff
2019-06-05
lain
Transmogrifier: Add tests for incoming follows to locke...
tree
|
commitdiff
2019-06-05
rinpatch
Merge branch 'fix-stuck-follows' into 'develop'
tree
|
commitdiff
2019-06-05
lain
Typo + Linting.
tree
|
commitdiff
2019-06-05
lain
User: Don't error out when following a user that's...
tree
|
commitdiff
2019-06-05
kaniini
Merge branch 'explicit-addressing' into 'develop'
tree
|
commitdiff
2019-06-04
Roman Chvanikov
Fix conflict
tree
|
commitdiff
2019-06-04
Haelwenn
Merge branch 'remove-tag-warning' into 'develop'
tree
|
commitdiff
2019-06-04
Haelwenn
Merge branch 'bugfix/956-activity-id-nil-conversations...
tree
|
commitdiff
2019-06-04
lain
Merge branch 'issue/941' into 'develop'
tree
|
commitdiff
2019-06-04
Maksim Pechnikov
Merge branch 'develop' into issue/941
tree
|
commitdiff
2019-06-04
Haelwenn
Merge branch 'emoji-loader-fix' into 'develop'
tree
|
commitdiff
2019-06-04
lain
Merge branch 'fix/fetch-votes-restrict-create' into...
tree
|
commitdiff
2019-06-04
rinpatch
Add tests for get_existing_votes
tree
|
commitdiff
2019-06-04
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-06-04
Maksim Pechnikov
Merge branch 'develop' into issue/941
tree
|
commitdiff
2019-06-04
kaniini
Merge branch 'feature/mrf-subchain' into 'develop'
tree
|
commitdiff
2019-06-04
kaniini
Merge branch 'generic-fe-settings' into 'develop'
tree
|
commitdiff
2019-06-04
kaniini
Merge branch 'ueberauth_config_extension' into 'develop'
tree
|
commitdiff
2019-06-03
Mark Felder
Merge branch 'develop' into feature/digest-email
tree
|
commitdiff
2019-06-03
Mark Felder
Merge branch 'develop' into update-oauth-template
tree
|
commitdiff
2019-06-03
Maksim Pechnikov
add option skip_thread_containment
tree
|
commitdiff
2019-06-03
rinpatch
Merge branch 'feature/polls-2-electric-boogalo' into...
tree
|
commitdiff
2019-06-03
rinpatch
Merge branch 'develop' into feature/polls-2-electric...
tree
|
commitdiff
2019-06-03
lambda
Merge branch 'align-mastodon-conversations' into 'develop'
tree
|
commitdiff
2019-06-03
rinpatch
Merge branch 'develop' into feature/polls-2-electric...
tree
|
commitdiff
2019-06-02
William Pitcock
test: add tests for subchain policy
tree
|
commitdiff
2019-06-02
kaniini
Merge branch 'feature/notification-control-part-2'...
tree
|
commitdiff
2019-06-01
rinpatch
Resolve merge conflicts
tree
|
commitdiff
2019-06-01
kaniini
Merge branch 'bugfix/visibility-indicator-litepub-dm...
tree
|
commitdiff
2019-06-01
kaniini
Merge branch 'bugfix/remove-others-follower-collections...
tree
|
commitdiff
2019-06-01
Sergey Suprunenko
Remove all follower collections but actor's from "cc"
tree
|
commitdiff
2019-06-01
William Pitcock
visibility: if litepub:directMessage is asserted, alway...
tree
|
commitdiff
2019-05-31
Haelwenn
Merge branch 'dokku' into 'develop'
tree
|
commitdiff
2019-05-31
lambda
Merge branch 'hotfix/leaking-lists' into 'develop'
tree
|
commitdiff
2019-05-31
rinpatch
Mastodon API: Fix lists leaking private posts
tree
|
commitdiff
2019-05-31
rinpatch
Fix fix_explicit_addressing moving follower collection...
tree
|
commitdiff
2019-05-29
Roman Chvanikov
Merge develop
tree
|
commitdiff
2019-05-26
lambda
Merge branch 'refactor/die-httpoison-die' into 'develop'
tree
|
commitdiff
2019-05-26
kaniini
Merge branch 'fix/mrf-simple' into 'develop'
tree
|
commitdiff
2019-05-26
William Pitcock
mrf: simple policy: fix matching imported activitypub...
tree
|
commitdiff
2019-05-22
kaniini
Merge branch 'feature/mrf-user-filter' into 'develop'
tree
|
commitdiff
2019-05-22
William Pitcock
tests: add tests for banner and avatar removal
tree
|
commitdiff
2019-05-22
rinpatch
Normalize poll votes to Answer objects
tree
|
commitdiff
2019-05-22
lambda
Merge branch 'feature/object-pruning' into 'develop'
tree
|
commitdiff
2019-05-22
lambda
Merge branch 'refactor/keys' into 'develop'
tree
|
commitdiff
2019-05-22
kaniini
Merge branch 'mongooseim-support' into 'develop'
tree
|
commitdiff
2019-05-22
William Pitcock
move key generation functions into Pleroma.Keys module
tree
|
commitdiff
2019-05-21
rinpatch
Handle poll votes
tree
|
commitdiff
2019-05-19
kaniini
Merge branch 'feature/mrf-simple-report-filtering'...
tree
|
commitdiff
2019-05-19
Aaron Tinio
Add report filtering to MRF.SimplePolicy
tree
|
commitdiff
2019-05-18
rinpatch
Resolve merge conflicts and remove IO.inspects
tree
|
commitdiff
2019-05-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-05-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-05-17
kaniini
Merge branch 'fix/mrf-tag-typo' into 'develop'
tree
|
commitdiff
2019-05-17
Aaron Tinio
Add tests for MRF.SimplePolicy
tree
|
commitdiff
2019-05-16
kaniini
Merge branch 'feature/890-add-report-uri' into 'develop'
tree
|
commitdiff
2019-05-16
feld
Merge branch 'fix/domain-unblocked-reblogs' into 'develop'
tree
|
commitdiff
2019-05-16
rinpatch
Merge branch 'conversations-import' into 'develop'
tree
|
commitdiff
2019-05-16
Mark Felder
Merge branch 'develop' into conversations-import
tree
|
commitdiff
2019-05-16
lambda
Merge branch 'feature/sql-thread-sat' into 'develop'
tree
|
commitdiff
2019-05-15
Aaron Tinio
Restrict reblogs of activities from blocked domains
tree
|
commitdiff
2019-05-15
Aaron Tinio
Add test for blocked domains
tree
|
commitdiff
2019-05-15
rinpatch
Handle incoming Question objects
tree
|
commitdiff
2019-05-15
William Pitcock
chase test failures
tree
|
commitdiff
2019-05-15
William Pitcock
test: update obsolete test
tree
|
commitdiff
2019-05-15
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-05-15
kaniini
Merge branch 'fix/public-option-not-working' into ...
tree
|
commitdiff
2019-05-15
lambda
Merge branch 'chore/extricate-http-signatures' into...
tree
|
commitdiff
2019-05-15
kaniini
Merge branch 'prevent-public-answers' into 'develop'
tree
|
commitdiff
2019-05-15
lain
CommonAPI: Refactor visibility, forbid public to privat...
tree
|
commitdiff
2019-05-14
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2019-05-13
lambda
Merge branch 'feature/federator-behaviours' into 'develop'
tree
|
commitdiff
2019-05-13
lambda
Merge branch 'mascot/pleroma-tan-shy' into 'develop'
tree
|
commitdiff
2019-05-12
William Pitcock
tests: fix AP test failures
tree
|
commitdiff
next