projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
templates
/
o_auth
/
o_auth
/
show.html.eex
2019-04-29
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
2019-04-19
kaniini
Merge branch 'feature/database-compaction' into 'develop'
blob
|
commitdiff
|
raw
2019-04-19
lambda
Merge branch '923_oauth_consumer_refactoring_ci' into...
blob
|
commitdiff
|
raw
2019-04-17
rinpatch
Merge branch 'develop' into feature/database-compaction
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'features/mastoapi/2.6.0-min_id-pagination...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'fix/732-password-align' into 'develop'
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-10
Ivan Tashkinov
[#923] OAuth consumer params handling refactoring.
blob
|
commitdiff
|
raw
2019-04-10
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
lambda
Merge branch 'feature/767-multiple-use-invite-token...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
Sadposter
Merge branch 'develop' into feature/user-status-subscri...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
kaniini
Merge branch 'hotfix/fix_undefined_summary' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
kaniini
Merge branch 'notification-pleroma-settings' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-09
lambda
Merge branch 'bugfix/follower_count' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lambda
Merge branch 'improve_upgrade_user_from_ap_id' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lambda
Merge branch 'twitter_oauth' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-05
Ivan Tashkinov
[#923] OAuth consumer mode refactoring, new tests,...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-04
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-04
Ivan Tashkinov
[#923] OAuth consumer controller tests. Misc. improvements.
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
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
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-01
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
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-27
Ivan Tashkinov
[#923] OAuth consumer improvements, fixes, refactoring.
blob
|
commitdiff
|
raw
|
diff to current
2019-03-20
Ivan Tashkinov
[#923] Support for multiple OAuth consumer strategies.
blob
|
commitdiff
|
raw
|
diff to current
2019-03-18
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-18
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
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-15
Ivan Tashkinov
[#923] OAuth: prototype of sign in / sign up with Twitter.
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-11
rinpatch
Merge branch 'ci-switch-to-elixir-1-8-1' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-11
Ivan Tashkinov
Sign in via Twitter (WIP).
blob
|
commitdiff
|
raw
|
diff to current
2019-03-11
lambda
Merge branch 'add-local-field-to-status' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-11
lambda
Merge branch 'feat/style-oauth-login-page' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-11
Shpuld Shpuldson
Style again the login page to fit pleroma more
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 'feature/add-oauth-tokens-endpoint' into...
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-17
Ivan Tashkinov
[#468] Refactored OAuth scopes' defaults & missing...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-15
Ivan Tashkinov
[#468] Defined OAuth restrictions for all applicable...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-15
rinpatch
Merge branch 'hellthread-filter-fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
lambda
Merge branch 'bugfix/activitypub-reserialization' into...
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
kaniini
Merge branch 'fix/credo-issues-test' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
kaniini
Merge branch 'feature/activitypub-oauth-endpoints'...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-13
kaniini
Merge branch 'feature/better-login-errors' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-13
Mark Felder
Improve login error for OAuth flow
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-09
Ivan Tashkinov
[#468] Prototype of OAuth2 scopes support. TwitterAPI...
blob
|
commitdiff
|
raw
|
diff to current
2018-05-06
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-28
lambda
Merge branch 'fix/blocked-user-boosts' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-24
lambda
Merge branch 'feature/message-rewrite-facility' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-04-24
lambda
Merge branch 'favicon_tag' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-20
Francis Dinh
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2018-04-18
lambda
Merge branch 'fix/rm-user-task' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-18
lambda
Merge branch 'fix/login-with-username-or-email' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-04-18
eal
MastoAPI and OAuth: allow login with either email or...
blob
|
commitdiff
|
raw
|
diff to current
2018-02-12
lain
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed...
blob
|
commitdiff
|
raw
|
diff to current
2018-02-11
Hakaba Hitoyo
Merge remote-tracking branch 'hakabahitoyo/feature...
blob
|
commitdiff
|
raw
|
diff to current
2018-02-11
Roger Braun
Merge branch 'develop' into feature/activitypub
blob
|
commitdiff
|
raw
|
diff to current
2018-02-09
lambda
Merge branch 'develop' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-02-08
Calv Collins
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2018-02-08
Calv Collins
Create action_fallback for username/password incorrect...
blob
|
commitdiff
|
raw
|
diff to current
2017-09-14
Roger Braun
Preserve state in oauth
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-06
Roger Braun
Add very basic oauth and mastodon api support.
blob
|
commitdiff
|
raw
|
diff to current
projects / akkoma / history