projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'fix-dokku' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
oauth
/
authorization.ex
2019-05-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
2019-05-17
lambda
Merge branch 'bugfix/903-mastoapi-relationship-requeste...
blob
|
commitdiff
|
raw
2019-05-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
2019-05-17
rinpatch
Merge branch 'fix/902-random-compile-failing' into...
blob
|
commitdiff
|
raw
2019-05-17
Alexander Strizhakov
Fix/902 random compile failing
blob
|
commitdiff
|
raw
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-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-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-05-01
Alex S
Merging with develop
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-04-11
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'features/pleroma-tan' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-27
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-25
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-24
rinpatch
Merge branch 'fix/eldap-warnings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-22
lambda
Merge branch 'safe-mentions' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-22
kaniini
Merge branch 'safe-mentions' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-21
rinpatch
Merge branch 'ecto-3-migration' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-20
rinpatch
Ecto 3.0.5 migration
blob
|
commitdiff
|
raw
|
diff to current
2019-03-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
rinpatch
Merge develop to bump elixir version in the CI so I...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
rinpatch
Merge branch 'hotfix/delete-activities' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
link0ff
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
kaniini
Merge branch 'mastofe-content-types' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
lambda
Merge branch 'features/add-credo-to-ci' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
Haelwenn (lanodan...
[Credo] fix Credo.Check.Readability.AliasOrder
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-02-09
Haelwenn (lanodan...
de-group alias/es
blob
|
commitdiff
|
raw
|
diff to current
2019-02-09
Ivan Tashkinov
[#468] Prototype of OAuth2 scopes support. TwitterAPI...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
kaniini
Merge branch 'spc-fix-3' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-29
kaniini
Merge branch 'hj-happiness-improvement' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-28
Ivan Tashkinov
[#534] Merged `upstream/develop`.
blob
|
commitdiff
|
raw
|
diff to current
2019-01-25
kaniini
Merge branch 'fix/tusky-dm' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-25
kaniini
Merge branch 'develop' into 'oembed_provider'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-25
kaniini
Merge branch 'classic-flakeids' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-23
href
Flake Ids for Users and Activities
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-12-06
Egor Kislitsyn
Merge branch 'develop' into feature/compat/push-subscri...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-01
rinpatch
Attempt to resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-10-18
kaniini
Merge branch 'bugfix/html-scrub-schemes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-10-14
kaniini
Merge branch 'security/clear-oauth-with-password' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-10-14
Haelwenn (lanodan...
Delete Tokens and Authorizations on password change
blob
|
commitdiff
|
raw
|
diff to current
2018-05-24
lambda
Merge branch 'feature/lists' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-05-13
lambda
Merge branch 'feature/unrepeats' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-05-13
lain
Merge branch 'develop' into kaniini/pleroma-bugfix...
blob
|
commitdiff
|
raw
|
diff to current
2018-05-13
lambda
Merge branch 'patch-2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-05-13
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-05-07
lain
More warning fixes.
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
2018-03-22
lain
Merge branch 'develop' into kaniini/pleroma-feature...
blob
|
commitdiff
|
raw
|
diff to current
2018-03-22
lain
Fix test.
blob
|
commitdiff
|
raw
|
diff to current
2018-03-20
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-03-20
lambda
Merge branch 'patch-README' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next