projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Merge remote-tracking branch 'origin/develop' into global-status-expiration
[akkoma]
/
lib
/
pleroma
/
web
/
oauth
/
app.ex
2020-03-12
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2020-03-11
feld
Merge branch 'fix/signup-without-email' into 'develop'
blob
|
commitdiff
|
raw
2020-03-11
feld
Merge branch 'relay-list-change' into 'develop'
blob
|
commitdiff
|
raw
2020-03-09
lain
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
2020-03-08
rinpatch
Merge branch 'release/2.0.0' into 'stable'
blob
|
commitdiff
|
raw
2020-03-07
rinpatch
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
blob
|
commitdiff
|
raw
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
2020-03-04
feld
Merge branch 'exclude-reblogs-from-admin-api-by-default...
blob
|
commitdiff
|
raw
2020-03-04
lain
Merge branch 'fix/no-email-no-fail' into 'develop'
blob
|
commitdiff
|
raw
2020-03-03
Haelwenn
Merge branch 'chore/update-copyrights' into 'develop'
blob
|
commitdiff
|
raw
2020-03-03
Mark Felder
Update Copyrights
blob
|
commitdiff
|
raw
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
2019-02-15
lambda
Merge branch 'bugfix/oauth-token-padding' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
Wim Vanderbauwhede
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
William Pitcock
oauth: never use base64 padding when returning tokens...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-13
Ivan Tashkinov
[#468] User UI for OAuth permissions restriction. Stand...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-11
Karen Konou
Merge branch 'develop' into feature/thread-muting
blob
|
commitdiff
|
raw
|
diff to current
2019-02-11
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'update-mastofe/glitch-soc-2019-02-10...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'feather_mention' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'fix/credo-issues' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-09
Haelwenn (lanodan...
de-group import/s
blob
|
commitdiff
|
raw
|
diff to current
2019-01-13
rinpatch
Resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-01-05
kaniini
Merge branch 'fix_486' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-03
rinpatch
Merge branch 'captcha' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-01
lambda
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-01
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'features/admin-api-user-views' into ...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'docs/admin-api' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'maintenance/copyright-2019' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
William Pitcock
update copyright years to 2019
blob
|
commitdiff
|
raw
|
diff to current
2018-12-28
kaniini
Merge branch 'systemd-drop-sysadmin-privilege' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-27
kaniini
Merge branch 'feature/create-tombstone-instead-of-delet...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-25
lambda
Merge branch 'legal-boilerplate' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-23
William Pitcock
add license boilerplate to pleroma core
blob
|
commitdiff
|
raw
|
diff to current
2018-05-06
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-10
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-01
KANEKO Yoshitaka
Fix conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-03-30
lain
Format the code.
blob
|
commitdiff
|
raw
|
diff to current
2017-09-11
lambadalambda
Merge branch 'oauth2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2017-09-11
Roger Braun
Merge branch 'develop' into oauth2
blob
|
commitdiff
|
raw
|
diff to current
2017-09-07
Roger Braun
Slight cleanup.
blob
|
commitdiff
|
raw
|
diff to current
projects / akkoma / history