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
/
oauth_controller.ex
2020-06-22
lain
Merge branch 'feature/1739-account-endpoints' into...
blob
|
commitdiff
|
raw
2020-06-20
lain
Merge branch 'bugfix/mix.exs-version-dot-git-less'...
blob
|
commitdiff
|
raw
2020-06-12
Mark Felder
Merge branch 'develop' into preload-data
blob
|
commitdiff
|
raw
2020-06-08
Roman Chvanikov
merge develop
blob
|
commitdiff
|
raw
2020-06-08
Egor Kislitsyn
Merge branch 'develop' into global-status-expiration
blob
|
commitdiff
|
raw
2020-06-08
lain
Merge branch 'openapi/admin/relay' into 'develop'
blob
|
commitdiff
|
raw
2020-06-05
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2020-06-05
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
2020-06-05
Haelwenn
Merge branch 'features/apc2s-pagination' into 'develop'
blob
|
commitdiff
|
raw
2020-06-05
Haelwenn
Merge branch 'features/put_if_present' into 'develop'
blob
|
commitdiff
|
raw
2020-06-05
Haelwenn
Create Pleroma.Maps.put_if_present(map, key, value...
blob
|
commitdiff
|
raw
2020-06-01
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-01
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-18
lain
Merge branch 'docs/storing-remote-media' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-14
lain
Merge branch 'features/openrc-console' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-10
lain
Merge branch 'shortening-modules-name' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-08
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-08
lain
Merge branch 'fix/privacy-notification' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-08
Maksim Pechnikov
Merge branch 'develop' into issue/1276-2
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
Haelwenn
Merge branch 'feature/restrict-c2s' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
lain
Merge branch 'openapi/polls' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
lain
Merge branch 'streamer-worker-registry' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
lain
Merge branch 'issue/209' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
Maksim
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationControlle...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-05
Egor Kislitsyn
Merge branch 'develop' into global-status-expiration
blob
|
commitdiff
|
raw
|
diff to current
2020-05-02
rinpatch
Merge branch 'feature/1710-consolidate-instance-info...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-01
lain
Merge branch 'issue/1577' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-01
Maksim Pechnikov
Merge branch 'develop' into issue/1276-2
blob
|
commitdiff
|
raw
|
diff to current
2020-04-30
lain
Merge branch '1364-no-pushes-from-blocked-domains-users...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-30
Egor Kislitsyn
Merge branch 'develop' into openapi/notifications
blob
|
commitdiff
|
raw
|
diff to current
2020-04-30
Egor Kislitsyn
Merge branch 'develop' into openapi/reports
blob
|
commitdiff
|
raw
|
diff to current
2020-04-29
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-29
lain
Merge branch 'automatic-authentication-and-instance...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-28
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-28
lain
Merge branch 'mongoose-secure' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-24
Ivan Tashkinov
[#2409] Tested all auth setup configs in AuthTestContro...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-22
lain
Merge branch 'docs/debian-packages' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-21
lain
Merge branch 'openapi/custom-emojis' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-21
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-20
Egor Kislitsyn
Merge branch 'develop' into global-status-expiration
blob
|
commitdiff
|
raw
|
diff to current
2020-04-20
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-20
Egor Kislitsyn
Merge branch 'develop' into openapi/account
blob
|
commitdiff
|
raw
|
diff to current
2020-04-20
lain
Merge branch 'cleanup-subscription-controller' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-20
lain
Merge branch 'mrf-docs-update' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-17
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-17
Haelwenn
Merge branch 'feature/1584-client-captcha-options'...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-17
Haelwenn
Merge branch 'feature/1677-need_reboot-flag-endpoint...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-16
rinpatch
Merge branch 'authenticated-api-oauth-check-enforcement...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-06
Ivan Tashkinov
Enforcement of OAuth scopes check for authenticated...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-19
lain
Merge branch 'remake-remodel' into develop
blob
|
commitdiff
|
raw
|
diff to current
2020-03-13
rinpatch
Merge branch 'feature/mastofe-admin-scope' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-13
rinpatch
Merge branch 'docs/direct_conversation_id' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-13
rinpatch
Merge branch 'static-accept-missing' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-09
lain
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-08
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2020-03-08
rinpatch
Merge branch 'release/2.0.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-07
rinpatch
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
|
diff to current
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
|
diff to current
2020-03-04
lain
Merge branch 'fix/no-email-no-fail' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-03
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
lain
Merge branch 'prepared-statements-settings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Egor Kislitsyn
Merge branch 'develop' into fix/signup-without-email
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Haelwenn
Merge branch 'feature/1482-activity_pub_transactions...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Haelwenn
Merge branch 'chores/bump-copyright' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Haelwenn (lanodan...
Bump copyright years of files changed after 2020-01-07
blob
|
commitdiff
|
raw
|
diff to current
2020-02-20
lain
Merge branch 'require-signature' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-20
lain
Merge branch 'docs_updating' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-11
Egor Kislitsyn
Merge branch 'develop' into feature/new-registrations...
blob
|
commitdiff
|
raw
|
diff to current
2020-02-05
rinpatch
Merge branch 'feature/restart-pleroma-from-outside...
blob
|
commitdiff
|
raw
|
diff to current
2020-02-05
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-30
rinpatch
Merge branch 'develop' into fix/disable-rate-limiter...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-28
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-28
feld
Merge branch 'fix/attachments-cleanup' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-28
lain
Merge branch 'translation/errors-french' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-28
lain
Merge branch 'fix/attachments-cleanup' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-27
Maksim Pechnikov
Merge branch 'develop' into feature/tag_feed
blob
|
commitdiff
|
raw
|
diff to current
2020-01-27
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2020-01-27
Maksim Pechnikov
Merge branch 'develop' into issue/1383
blob
|
commitdiff
|
raw
|
diff to current
2020-01-26
feld
Merge branch 'fix/runtime-config' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-26
feld
Merge branch 'issue/1280' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-26
Mark Felder
Merge branch 'develop' into issue/1280
blob
|
commitdiff
|
raw
|
diff to current
2020-01-22
rinpatch
Merge branch 'no-error-404' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-22
Egor Kislitsyn
Merge branch 'develop' into feature/new-registrations...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-22
Maksim Pechnikov
Merge branch 'develop' into issue/1383
blob
|
commitdiff
|
raw
|
diff to current
2020-01-21
Roman Chvanikov
Merge branch 'develop' into fix/attachments-cleanup
blob
|
commitdiff
|
raw
|
diff to current
2020-01-21
Alexander Strizhakov
Merge branch 'develop' into admin-be
blob
|
commitdiff
|
raw
|
diff to current
2020-01-21
Maksim Pechnikov
Merge branch 'develop' into feature/tag_feed
blob
|
commitdiff
|
raw
|
diff to current
2020-01-20
Mark Felder
Merge branch 'develop' into fix/attachments-cleanup
blob
|
commitdiff
|
raw
|
diff to current
2020-01-20
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-20
rinpatch
Merge branch 'favoritng-responses' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-20
lain
Merge branch 'credo/version-bump-1.1.5' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-20
lain
Merge branch 'fix-admin-api-scope' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next