[#468] Merged `upstream/develop`, resolved conflicts.
[akkoma] / lib / pleroma / web / oauth / authorization.ex
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts.
2019-02-15 lambdaMerge branch 'bugfix/oauth-token-padding' into 'develop'
2019-02-14 William Pitcockoauth: never use base64 padding when returning tokens...
2019-02-13 Ivan Tashkinov[#468] User UI for OAuth permissions restriction. Stand...
2019-02-11 Karen KonouMerge branch 'develop' into feature/thread-muting
2019-02-10 kaniiniMerge branch 'update-mastofe/glitch-soc-2019-02-10...
2019-02-10 kaniiniMerge branch 'feather_mention' into 'develop'
2019-02-10 kaniiniMerge branch 'fix/credo-issues' into 'develop'
2019-02-09 Haelwenn (lanodan... de-group import/s
2019-02-09 Haelwenn (lanodan... de-group alias/es
2019-02-09 Ivan Tashkinov[#468] Prototype of OAuth2 scopes support. TwitterAPI...
2019-01-31 kaniiniMerge branch 'spc-fix-3' into 'develop'
2019-01-29 kaniiniMerge branch 'hj-happiness-improvement' into 'develop'
2019-01-28 Ivan Tashkinov[#534] Merged `upstream/develop`.
2019-01-25 kaniiniMerge branch 'fix/tusky-dm' into 'develop'
2019-01-25 kaniiniMerge branch 'develop' into 'oembed_provider'
2019-01-25 kaniiniMerge branch 'classic-flakeids' into 'develop'
2019-01-23 hrefFlake Ids for Users and Activities
2019-01-13 rinpatchResolve merge conflict
2019-01-05 kaniiniMerge branch 'fix_486' into 'develop'
2019-01-03 rinpatchMerge branch 'captcha' into 'develop'
2019-01-01 lambdaMerge branch 'cleanup/admin-api-useless-if' into 'develop'
2019-01-01 lainMerge remote-tracking branch 'origin/develop' into...
2018-12-31 kaniiniMerge branch 'features/admin-api-user-views' into ...
2018-12-31 kaniiniMerge branch 'docs/admin-api' into 'develop'
2018-12-31 kaniiniMerge branch 'maintenance/copyright-2019' into 'develop'
2018-12-31 William Pitcockupdate copyright years to 2019
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-27 kaniiniMerge branch 'feature/create-tombstone-instead-of-delet...
2018-12-25 lambdaMerge branch 'legal-boilerplate' into 'develop'
2018-12-23 William Pitcockadd license boilerplate to pleroma core
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-10-18 kaniiniMerge branch 'bugfix/html-scrub-schemes' into 'develop'
2018-10-14 kaniiniMerge branch 'security/clear-oauth-with-password' into...
2018-10-14 Haelwenn (lanodan... Delete Tokens and Authorizations on password change
2018-05-24 lambdaMerge branch 'feature/lists' into 'develop'
2018-05-13 lambdaMerge branch 'feature/unrepeats' into 'develop'
2018-05-13 lainMerge branch 'develop' into kaniini/pleroma-bugfix...
2018-05-13 lambdaMerge branch 'patch-2' into 'develop'
2018-05-13 lambdaMerge branch 'feld-varnish' into 'develop'
2018-05-07 lainMore warning fixes.
2018-05-06 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-10 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-01 KANEKO YoshitakaFix conflict
2018-03-30 lainFormat the code.
2018-03-22 lainMerge branch 'develop' into kaniini/pleroma-feature...
2018-03-22 lainFix test.
2018-03-20 lambdaMerge branch 'feld-varnish' into 'develop'
2018-03-20 lambdaMerge branch 'patch-README' into 'develop'
2018-03-20 lambdaMerge branch 'feld-mastoweb5000' into 'develop'
2018-03-20 lambdaMerge branch 'feld-Logger' into 'develop'
2018-03-19 Mark Feldercap again
2018-03-19 Mark Felderstart with a capital
2017-09-11 lambadalambdaMerge branch 'oauth2' into 'develop'
2017-09-11 Roger BraunMerge branch 'develop' into oauth2
2017-09-09 Roger BraunMake auth tokens usable once and expire them.
2017-09-07 Roger BraunSlight cleanup.
2017-09-06 Roger BraunAdd very basic oauth and mastodon api support.