[#468] Merged `upstream/develop`, resolved conflicts.
[akkoma] / lib / pleroma / web / templates / o_auth / o_auth / show.html.eex
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts.
2019-02-17 Ivan Tashkinov[#468] Refactored OAuth scopes' defaults & missing...
2019-02-15 Ivan Tashkinov[#468] Defined OAuth restrictions for all applicable...
2019-02-15 rinpatchMerge branch 'hellthread-filter-fix' into 'develop'
2019-02-14 lambdaMerge branch 'bugfix/activitypub-reserialization' into...
2019-02-14 kaniiniMerge branch 'fix/credo-issues-test' into 'develop'
2019-02-14 kaniiniMerge branch 'feature/activitypub-oauth-endpoints'...
2019-02-13 kaniiniMerge branch 'feature/better-login-errors' into 'develop'
2019-02-13 Mark FelderImprove login error for OAuth flow
2019-02-13 Ivan Tashkinov[#468] User UI for OAuth permissions restriction. Stand...
2019-02-09 Ivan Tashkinov[#468] Prototype of OAuth2 scopes support. TwitterAPI...
2018-05-06 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-28 lambdaMerge branch 'fix/blocked-user-boosts' into 'develop'
2018-04-24 lambdaMerge branch 'feature/message-rewrite-facility' into...
2018-04-24 lambdaMerge branch 'favicon_tag' into 'develop'
2018-04-20 Francis DinhMerge branch 'develop' of https://git.pleroma.social...
2018-04-18 lambdaMerge branch 'fix/rm-user-task' into 'develop'
2018-04-18 lambdaMerge branch 'fix/login-with-username-or-email' into...
2018-04-18 ealMastoAPI and OAuth: allow login with either email or...
2018-02-12 lainMerge branch 'hakabahitoyo/pleroma-feature/atom-feed...
2018-02-11 Hakaba HitoyoMerge remote-tracking branch 'hakabahitoyo/feature...
2018-02-11 Roger BraunMerge branch 'develop' into feature/activitypub
2018-02-09 lambdaMerge branch 'develop' into 'develop'
2018-02-08 Calv CollinsMerge branch 'develop' of https://git.pleroma.social...
2018-02-08 Calv CollinsCreate action_fallback for username/password incorrect...
2017-09-14 Roger BraunPreserve state in oauth
2017-09-11 lambadalambdaMerge branch 'oauth2' into 'develop'
2017-09-11 Roger BraunMerge branch 'develop' into oauth2
2017-09-06 Roger BraunAdd very basic oauth and mastodon api support.