projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
[#1364] Resolved merge conflicts with `develop`.
[akkoma]
/
test
/
support
/
2019-12-04
Maksim Pechnikov
Merge branch 'develop' into issue/1383
tree
|
commitdiff
2019-12-04
Maksim Pechnikov
updated ScheduledActivity
tree
|
commitdiff
2019-12-02
lain
Merge branch 'feature/move-activity' into 'develop'
tree
|
commitdiff
2019-12-01
Maksim Pechnikov
Merge branch 'develop' into issue/1411
tree
|
commitdiff
2019-11-30
rinpatch
Merge branch 'remove-info-from-users' into 'develop'
tree
|
commitdiff
2019-11-30
rinpatch
Merge branch 'hide-relation-for-friendica' into 'develop'
tree
|
commitdiff
2019-11-30
rinpatch
Merge branch 'benchmarks/favourites_timeline' into...
tree
|
commitdiff
2019-11-30
kPherox
test missing first field
tree
|
commitdiff
2019-11-29
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-11-28
Maksim Pechnikov
added User.NotificationSetting struct
tree
|
commitdiff
2019-11-28
Maksim Pechnikov
Merge branch 'develop' into issue/1383
tree
|
commitdiff
2019-11-28
rinpatch
Merge branch 'chore/manual-benchmark' into 'develop'
tree
|
commitdiff
2019-11-28
lain
Merge branch 'fed-testing-updates' into 'develop'
tree
|
commitdiff
2019-11-26
Chris McCord
Add federated test infrastructure
tree
|
commitdiff
2019-11-26
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-11-25
Maxim Filippov
Fix tests
tree
|
commitdiff
2019-11-23
Ivan Tashkinov
Removed users.info and remaining usages.
tree
|
commitdiff
2019-11-21
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-11-20
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-11-20
Ivan Tashkinov
[#1335] Reorganized users.subscribers as UserRelationsh...
tree
|
commitdiff
2019-11-14
Egor Kislitsyn
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2019-11-11
lain
Merge branch 'iss-1376' into 'develop'
tree
|
commitdiff
2019-11-08
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-11-05
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-11-05
lain
Merge branch 'release/1.1.4' into 'stable'
tree
|
commitdiff
2019-11-05
Maxim Filippov
Merge branch 'develop' into feature/multiple-users...
tree
|
commitdiff
2019-11-04
Maxim Filippov
Merge branch 'develop' into feature/reports-groups...
tree
|
commitdiff
2019-11-04
Maksim Pechnikov
Merge branch 'develop' into issue/1276
tree
|
commitdiff
2019-11-04
lain
Merge branch 'transmogrifier-test-errors' into 'develop'
tree
|
commitdiff
2019-11-04
lain
Merge branch 'missing-tesla-mocks' into 'develop'
tree
|
commitdiff
2019-11-04
Steven Fuchs
add missing tesla mocks
tree
|
commitdiff
2019-11-04
lain
Merge branch 'feature/store-statuses-data-inside-flag...
tree
|
commitdiff
2019-11-01
lain
Tests: Fix tests failing because of info being null.
tree
|
commitdiff
2019-10-31
lain
Merge branch 'refactor/db-add-defaults' into 'develop'
tree
|
commitdiff
2019-10-30
Mark Felder
Merge branch 'develop' into feature/fast_sanitize
tree
|
commitdiff
2019-10-29
Maksim Pechnikov
Merge branch 'develop' into issue/1276
tree
|
commitdiff
2019-10-28
Egor Kislitsyn
Merge branch 'develop' into feature/move-activity
tree
|
commitdiff
2019-10-28
lain
Merge branch 'refactor/following-relationships' into...
tree
|
commitdiff
2019-10-27
Maxim Filippov
Merge branch 'develop' into feature/store-statuses...
tree
|
commitdiff
2019-10-24
Egor Kislitsyn
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2019-10-23
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-10-21
kaniini
Merge branch 'feature/push-subject-for-dm' into 'develop'
tree
|
commitdiff
2019-10-21
rinpatch
Merge branch 'fix/notifs-exclude-blocked-from-with...
tree
|
commitdiff
2019-10-21
kaniini
Merge branch 'feature/masto_api_markers' into 'develop'
tree
|
commitdiff
2019-10-21
Maksim Pechnikov
Merge branch 'develop' into feature/masto_api_markers
tree
|
commitdiff
2019-10-21
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-10-21
kaniini
Merge branch 'feature/activitypub-semantics' into ...
tree
|
commitdiff
2019-10-21
Egor Kislitsyn
Merge branch 'develop' into refactor/following-relation...
tree
|
commitdiff
2019-10-20
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-10-19
Ariadne Conill
implement invisible support for remote users
tree
|
commitdiff
2019-10-19
rinpatch
Merge branch 'mix-emoji-task-pack-json' into 'develop'
tree
|
commitdiff
2019-10-18
Mark Felder
Merge branch 'develop' into feature/push-subject-for-dm
tree
|
commitdiff
2019-10-18
rinpatch
Merge branch 'patch-1' into 'develop'
tree
|
commitdiff
2019-10-18
rinpatch
Merge branch 'fix/pleroma-ctl-rpc' into 'develop'
tree
|
commitdiff
2019-10-18
Maxim Filippov
Merge branch 'develop' into feature/relay-list
tree
|
commitdiff
2019-10-18
kaniini
Merge branch 'feature/ostatus-removal' into 'develop'
tree
|
commitdiff
2019-10-18
Ariadne Conill
add some missing tesla fixtures
tree
|
commitdiff
2019-10-18
Ariadne Conill
websub: remove entirely
tree
|
commitdiff
2019-10-17
Maksim Pechnikov
add Markers /api/v1/markers
tree
|
commitdiff
2019-10-16
lain
Merge branch 'benchmark-finishing' into 'develop'
tree
|
commitdiff
2019-10-11
Maxim Filippov
Merge branch 'develop' into feature/multiple-users...
tree
|
commitdiff
2019-10-10
Egor Kislitsyn
Replace `user.following` with Pleroma.FollowingRelationship
tree
|
commitdiff
2019-10-10
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-10-10
lain
Merge branch 'develop' into 'reactions'
tree
|
commitdiff
2019-10-10
Maxim Filippov
Merge branch 'develop' into feature/reports-groups...
tree
|
commitdiff
2019-10-09
kaniini
Merge branch 'unicode-search' into 'develop'
tree
|
commitdiff
2019-10-09
kaniini
Merge branch 'webfinger-mocks' into 'develop'
tree
|
commitdiff
2019-10-09
Steven Fuchs
provide mocks for webfinger endpoints
tree
|
commitdiff
2019-10-07
Maxim Filippov
Merge branch 'develop' into feature/reports-groups...
tree
|
commitdiff
2019-10-07
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-10-07
kaniini
Merge branch 'mrf/simple_policy/check_actor' into ...
tree
|
commitdiff
2019-10-07
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-10-07
lain
Merge branch 'misskey-compat' into 'reactions'
tree
|
commitdiff
2019-10-07
Haelwenn
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into...
tree
|
commitdiff
2019-10-06
rinpatch
Merge branch 'backport/key-moveout-1.1' into 'maint...
tree
|
commitdiff
2019-10-06
kaniini
Merge branch 'backport/feature-poll-refresh' into ...
tree
|
commitdiff
2019-10-06
rinpatch
Initial poll refresh support
tree
|
commitdiff
2019-10-06
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-10-06
lain
Merge branch 'develop' into 'reactions'
tree
|
commitdiff
2019-10-06
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-10-06
Haelwenn
Merge branch 'fix-prameter-name-of-accounts-update...
tree
|
commitdiff
2019-10-05
kaniini
Merge branch 'split-masto-api/leftovers' into 'develop'
tree
|
commitdiff
2019-10-05
kaniini
Merge branch 'accept-embedded-announce-object' into...
tree
|
commitdiff
2019-10-05
Thibaut Girka
Add test for handling Announces with inlined object...
tree
|
commitdiff
2019-10-05
Thibaut Girka
Import object from self-Announce whenever possible
tree
|
commitdiff
2019-10-04
kaniini
Merge branch 'bugfix/widen-streamer-blocks-for-1.1...
tree
|
commitdiff
2019-10-04
Egor Kislitsyn
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
tree
|
commitdiff
2019-10-04
lain
Merge branch 'featrue/job-monitor' into 'develop'
tree
|
commitdiff
2019-10-02
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-10-02
kaniini
Merge branch 'feature/send-identifier-on-oauth-error...
tree
|
commitdiff
2019-09-30
kPherox
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2019-09-30
Ivan Tashkinov
[#1260] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-09-30
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-09-30
kaniini
Merge branch 'features/apc2s-media-upload' into 'develop'
tree
|
commitdiff
2019-09-30
kaniini
Merge branch 'split-masto-api/reports' into 'develop'
tree
|
commitdiff
2019-09-30
kaniini
Merge branch 'split-masto-api/conversations' into ...
tree
|
commitdiff
2019-09-30
kaniini
Merge branch 'cleanup/drop-subscription-table-if-exists...
tree
|
commitdiff
2019-09-30
kaniini
Merge branch 'feature/scrobbling' into 'develop'
tree
|
commitdiff
2019-09-30
Ariadne Conill
test: factory: implement support for generating mock...
tree
|
commitdiff
2019-09-27
kaniini
Merge branch 'patch-2' into 'develop'
tree
|
commitdiff
next