projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
ActivityPub: Handle clashing nicknames for the same ap id
[akkoma]
/
lib
/
pleroma
/
web
/
oauth
/
2019-12-05
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
tree
|
commitdiff
2019-12-05
Ivan Tashkinov
[#1427] Reworked admin scopes support.
tree
|
commitdiff
2019-12-05
Maksim Pechnikov
Merge branch 'develop' into issue/1276
tree
|
commitdiff
2019-12-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-12-04
Maksim Pechnikov
Merge branch 'develop' into issue/1383
tree
|
commitdiff
2019-12-04
Maksim Pechnikov
Merge branch 'develop' into issue/1383
tree
|
commitdiff
2019-11-29
Ivan Tashkinov
[#1427] Initial support for OAuth admin scopes.
tree
|
commitdiff
2019-11-28
Maksim Pechnikov
Merge branch 'develop' into issue/1383
tree
|
commitdiff
2019-11-25
Maksim Pechnikov
moved OAuth.Token.CleanWorker to Oban Periodic jobs
tree
|
commitdiff
2019-11-21
lain
Merge branch 'issue/1348' into 'develop'
tree
|
commitdiff
2019-11-19
rinpatch
Merge branch 'release/1.1.6' into 'stable'
tree
|
commitdiff
2019-11-19
AkiraFukushima
Check client and token in GET /oauth/authorize
tree
|
commitdiff
2019-11-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-11-15
rinpatch
Merge branch 'bugfix/1395-email-activation' into 'develop'
tree
|
commitdiff
2019-11-14
Maxim Filippov
Merge branch 'develop' into feature/admin-api-list...
tree
|
commitdiff
2019-11-14
feld
Merge branch 'feature/reports-groups-and-multiple-state...
tree
|
commitdiff
2019-11-14
Egor Kislitsyn
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2019-11-14
rinpatch
Merge branch 'reactions' into 'develop'
tree
|
commitdiff
2019-11-11
kaniini
Merge branch 'feature/static-fe' into 'develop'
tree
|
commitdiff
2019-11-11
lain
Merge branch 'fix-dokku-2' into 'develop'
tree
|
commitdiff
2019-11-11
lain
Merge branch 'update-docs' into 'develop'
tree
|
commitdiff
2019-11-11
lain
Merge branch 'iss-1376' into 'develop'
tree
|
commitdiff
2019-11-11
lain
Merge branch 'fix/1399' into 'develop'
tree
|
commitdiff
2019-11-11
lain
Merge branch 'new-rate-limiter' into 'develop'
tree
|
commitdiff
2019-11-11
Steven Fuchs
New rate limiter
tree
|
commitdiff
2019-11-08
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-11-05
AkiraFukushima
Check client and token in GET /oauth/authorize
tree
|
commitdiff
2019-11-05
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-11-04
Maxim Filippov
Merge branch 'develop' into feature/reports-groups...
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-24
Maksim Pechnikov
Merge branch 'develop' into issue/1276
tree
|
commitdiff
2019-10-23
feld
Merge branch '1304-user-info-deprecation' into 'develop'
tree
|
commitdiff
2019-10-23
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-10-21
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-10-20
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-10-19
rinpatch
Merge branch 'mix-emoji-task-pack-json' into 'develop'
tree
|
commitdiff
2019-10-16
Ivan Tashkinov
[#1304] Moved all non-mutes / non-blocks fields from...
tree
|
commitdiff
2019-10-10
lain
Merge remote-tracking branch 'origin/develop' into...
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
Haelwenn
Merge branch '1260-rate-limited-auth-actions' 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
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
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
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-10-04
kaniini
Merge branch 'backport/hex-flake-id' into 'maint/1.1'
tree
|
commitdiff
2019-10-04
Egor Kislitsyn
Replace `Pleroma.FlakeId` with `flake_id` hex package
tree
|
commitdiff
2019-10-04
kaniini
Merge branch 'user-info-unread-direct-conversation...
tree
|
commitdiff
2019-10-04
feld
Merge branch 'develop' into 'fix/extended-nickname...
tree
|
commitdiff
2019-10-04
lain
Merge branch 'featrue/job-monitor' into 'develop'
tree
|
commitdiff
2019-10-04
lain
Merge branch 'fix/nickname-fail' into 'develop'
tree
|
commitdiff
2019-10-04
lain
Merge branch 'bugfix/notification-nil-actor' into ...
tree
|
commitdiff
2019-10-04
lain
Merge branch 'fix/oauth-controller' into 'develop'
tree
|
commitdiff
2019-10-04
Egor Kislitsyn
Fix OAuthController
tree
|
commitdiff
2019-10-02
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-10-02
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-10-02
kaniini
Merge branch 'feature/send-identifier-on-oauth-error...
tree
|
commitdiff
2019-10-01
Maxim Filippov
Send an identifier alongside with error message in...
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-29
kaniini
Merge branch 'feature/follow-requests-count' into ...
tree
|
commitdiff
2019-09-28
Haelwenn
Merge branch 'tests/mastodon_api_controller.ex' into...
tree
|
commitdiff
2019-09-28
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
tree
|
commitdiff
2019-09-27
kaniini
Merge branch 'patch-2' into 'develop'
tree
|
commitdiff
2019-09-27
kaniini
Merge branch 'update/docs-jp' into 'develop'
tree
|
commitdiff
2019-09-26
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
tree
|
commitdiff
2019-09-26
Maxim Filippov
Merge branch 'develop' into feature/moderation-log...
tree
|
commitdiff
2019-09-26
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
tree
|
commitdiff
2019-09-26
Roman Chvanikov
Merge develop
tree
|
commitdiff
2019-09-26
kaniini
Merge branch 'refactor/notification-controller' into...
tree
|
commitdiff
2019-09-26
kaniini
Merge branch 'feature/return-link-for-password-reset...
tree
|
commitdiff
2019-09-26
kaniini
Merge branch 'refactor/user' into 'develop'
tree
|
commitdiff
2019-09-26
kaniini
Merge branch 'hex-flake-id' into 'develop'
tree
|
commitdiff
2019-09-25
rinpatch
Merge branch 'hotfix/hackney-1.15.2' into 'develop'
tree
|
commitdiff
2019-09-25
Egor Kislitsyn
Replace `Pleroma.FlakeId` with `flake_id` hex package
tree
|
commitdiff
2019-09-25
Maksim Pechnikov
Merge branch 'develop' into issue/1218
tree
|
commitdiff
2019-09-24
Maxim Filippov
Merge branch 'develop' into feature/return-link-for...
tree
|
commitdiff
2019-09-24
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
tree
|
commitdiff
2019-09-23
kaniini
Merge branch 'feature/force-password-reset' into 'develop'
tree
|
commitdiff
2019-09-23
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
tree
|
commitdiff
2019-09-23
rinpatch
Merge branch 'better-emoji-packs' into 'develop'
tree
|
commitdiff
2019-09-22
Maxim Filippov
Merge branch 'develop' into feature/return-link-for...
tree
|
commitdiff
2019-09-22
Maxim Filippov
Admin API: Add ability to force user's password reset
tree
|
commitdiff
2019-09-19
Haelwenn
Merge branch 'docs/clients-update' into 'develop'
tree
|
commitdiff
2019-09-19
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-09-19
Maksim Pechnikov
Merge branch 'develop' into test/activity_pub/transmogr...
tree
|
commitdiff
2019-09-18
Haelwenn
Merge branch 'issue/733' into 'develop'
tree
|
commitdiff
2019-09-18
rinpatch
Merge branch 'chores/bump-copyright-year' into 'develop'
tree
|
commitdiff
2019-09-18
Haelwenn (lanodan...
Bump copyright years of files changed in 2019
tree
|
commitdiff
2019-09-18
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-09-18
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
next