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
/
app.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-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-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-04
Egor Kislitsyn
Merge branch 'develop' into openapi/admin/config
blob
|
commitdiff
|
raw
2020-06-03
stwf
Merge branch 'preload-data' of git.pleroma.social:stwf...
blob
|
commitdiff
|
raw
2020-06-02
feld
Merge branch 'fix/1794-hashtag-search-results' into...
blob
|
commitdiff
|
raw
2020-06-02
Egor Kislitsyn
Merge branch 'develop' into openapi/admin/relay
blob
|
commitdiff
|
raw
2020-06-02
lain
Merge branch 'replies-domain-block' into 'develop'
blob
|
commitdiff
|
raw
2020-06-02
lain
Merge branch 'openapi/admin/oauth-apps' into 'develop'
blob
|
commitdiff
|
raw
2020-06-01
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-25
Egor Kislitsyn
Add OpenAPI spec for AdminAPI.OAuthAppContoller
blob
|
commitdiff
|
raw
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-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-28
lain
Merge branch 'mongoose-secure' into 'develop'
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-19
rinpatch
Merge branch 'bugfix/mix.exs-version-dot-git-less'...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-18
Haelwenn
Merge branch 'bugfix/1697-user_emoji_miration' into...
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
rinpatch
Merge branch 'bugfix/1695-user_emoji_miration' into...
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-03-23
Alexander Strizhakov
creating trusted app from adminFE & mix task
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-12
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-11
feld
Merge branch 'fix/signup-without-email' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-11
feld
Merge branch 'relay-list-change' 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-06
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/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
feld
Merge branch 'exclude-reblogs-from-admin-api-by-default...
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
Mark Felder
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
|
diff to current
2020-03-03
Haelwenn
Merge branch 'chore/update-copyrights' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-03
Mark Felder
Update Copyrights
blob
|
commitdiff
|
raw
|
diff to current
2020-01-28
lain
Merge branch 'translation/errors-french' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-10
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-04
lain
Merge branch 'featrue/job-monitor' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-02
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
kPherox
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
Ivan Tashkinov
[#1260] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
kaniini
Merge branch 'features/apc2s-media-upload' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-29
kaniini
Merge branch 'feature/follow-requests-count' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-28
Haelwenn
Merge branch 'tests/mastodon_api_controller.ex' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-28
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-24
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-06
Maksim Pechnikov
tests for mastodon_api_controller.ex
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
Mark Felder
Merge branch 'develop' into update-oauth-template
blob
|
commitdiff
|
raw
|
diff to current
2019-05-29
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-05-18
rinpatch
Resolve merge conflicts and remove IO.inspects
blob
|
commitdiff
|
raw
|
diff to current
2019-05-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-15
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-14
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-14
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-13
lambda
Merge branch 'feature/federator-behaviours' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-13
kaniini
Merge branch 'features/mastoapi/2.7.0-registration...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-13
Alexander Strizhakov
differences_in_mastoapi_responses.md: fullname & bio...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-13
lambda
Merge branch 'mascot/pleroma-tan-shy' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-08
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-05-07
kaniini
Merge branch 'docs/MRF-modules' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-07
lambda
Merge branch 'conversations_three' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-07
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-06
lambda
Merge branch 'issue_800' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-06
Maksim
fix format
blob
|
commitdiff
|
raw
|
diff to current
2019-04-17
rinpatch
Merge branch 'develop' into feature/database-compaction
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'ssl_trusted_cert' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-04
Karen Konou
Merge branch 'bugfix/delete-activity-audience' of git...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-22
kaniini
Merge branch 'fix/twittercards' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-20
lambda
Merge branch '468_oauth2_scopes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-20
Ivan Tashkinov
[#468] Merged `upstream/develop`.
blob
|
commitdiff
|
raw
|
diff to current
2019-02-19
Mark Felder
Merge branch 'develop' into fix/twittercards
blob
|
commitdiff
|
raw
|
diff to current
2019-02-19
Ivan Tashkinov
[#468] Merged `upstream/develop`.
blob
|
commitdiff
|
raw
|
diff to current
2019-02-18
kaniini
Merge branch 'feature/jobs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-18
kaniini
Merge branch 'patch-image-description' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-18
kaniini
Merge branch 'feature/add-oauth-tokens-endpoint' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-18
kaniini
Merge branch 'follow-request-count' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-17
lambda
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
blob
|
commitdiff
|
raw
|
diff to current
next