merge develop
[akkoma] / lib / pleroma / web / oauth / oauth_controller.ex
2019-04-02 Alex SMerge develop into feature/770-add-emoji-tags
2019-04-02 lambdaMerge branch 'features/pleroma-tan' into 'develop'
2019-04-02 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-04-02 lambdaMerge branch 'features/mastoapi/2.6.0-force-login-optio...
2019-04-02 lambdaMerge branch 'get_by_id' into 'develop'
2019-04-02 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-04-02 Egor Kislitsynchange `Repo.get(User, id)` => `User.get_by_id(id)`
2019-04-02 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-02 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-04-01 Ivan TashkinovFixed local MastoFE authentication / `force_login`...
2019-04-01 Ivan TashkinovAdded `force_login` authentication option (previously...
2019-04-01 Ivan Tashkinov[#923] Deps config adjustment (no `override` for `httpo...
2019-04-01 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-03-29 lambdaMerge branch 'feature/deploy-docs' into 'develop'
2019-03-27 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-03-27 Ivan Tashkinov[#923] OAuth consumer improvements, fixes, refactoring.
2019-03-27 lambdaMerge branch 'feature/more-user-filters' into 'develop'
2019-03-26 lambdaMerge branch 'fix/ap-icon' into 'develop'
2019-03-26 lambdaMerge branch 'features/mastoapi/2.7.2-instance-attribut...
2019-03-26 lambdaMerge branch 'features/mastoapi/2.7.0-auth-error-messag...
2019-03-26 Ivan TashkinovComments split.
2019-03-26 Ivan TashkinovMastodon-based auth error messages. Defaulted User...
2019-03-20 Ivan Tashkinov[#923] Support for multiple OAuth consumer strategies.
2019-03-20 Ivan Tashkinov[#923] Nickname & email selection for external registra...
2019-03-18 Ivan Tashkinov[#923] Support for multiple (external) registrations...
2019-03-18 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-03-16 kaniiniMerge branch 'feature/federated-flags' into 'develop'
2019-03-16 lambdaMerge branch 'feature/oauth-me' into 'develop'
2019-03-16 kaniiniMerge branch 'feature/reblog-muting' into 'develop'
2019-03-16 William Pitcockoauth: add me property to token responses
2019-03-15 kaniiniMerge branch 'fix/mediaproxy-capture-content-dispositio...
2019-03-15 kaniiniMerge branch 'feature/openldap-support' into 'develop'
2019-03-15 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-03-15 Ivan Tashkinov[#923] OAuth: prototype of sign in / sign up with Twitter.
2019-03-14 rinpatchMerge develop to bump elixir version in the CI so I...
2019-03-14 rinpatchMerge branch 'hotfix/delete-activities' into 'develop'
2019-03-14 link0ffMerge remote-tracking branch 'upstream/develop' into...
2019-03-13 kaniiniMerge branch 'mastofe-content-types' into 'develop'
2019-03-13 lambdaMerge branch 'features/add-credo-to-ci' into 'develop'
2019-03-13 Haelwenn (lanodan... [Credo] fix Credo.Check.Readability.AliasOrder
2019-03-11 Ivan TashkinovSign in via Twitter (WIP).
2019-03-04 Karen KonouMerge branch 'bugfix/delete-activity-audience' of git...
2019-03-03 link0ffMove LDAP code to LDAPAuthenticator. Use Authenticator...
2019-03-03 rinpatchMerge branch 'remove-todo-txt' into 'develop'
2019-03-03 link0ffMerge remote-tracking branch 'upstream/develop' into...
2019-03-03 kaniiniMerge branch 'features/bio_rel_me' into 'develop'
2019-03-03 kaniiniMerge branch 'feature/add-pagination-to-users-admin...
2019-03-03 lambdaMerge branch 'fix/dont-show-dms-in-mentions-timeline...
2019-03-02 rinpatchMerge branch 'bugfix/oauth-scopes-join' into 'develop'
2019-03-02 Haelwenn (lanodan... Web.OAuth.OAuthController: Fix scopes Enum.join for...
2019-03-01 lambdaMerge branch 'bugfix/236-ambiguous-route-for-numerical...
2019-02-28 hrefMerge branch 'customizable_auth' into 'develop'
2019-02-28 Ivan TashkinovRenamed *DatabaseAuthenticator to *Authenticator.
2019-02-28 Ivan TashkinovAdded `auth_template/0` to DatabaseAuthenticator.
2019-02-28 kaniiniMerge branch 'with-mutes' into 'develop'
2019-02-28 hrefMerge branch 'customizable_auth' into 'develop'
2019-02-28 Ivan TashkinovMade auth customization be runtime-configurable.
2019-02-26 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-02-26 Ivan TashkinovDatabase authenticator behaviour / Pleroma implementati...
2019-02-22 link0ffOpenLDAP support
2019-02-22 kaniiniMerge branch 'fix/twittercards' into 'develop'
2019-02-21 Ivan TashkinovAuth customization support.
2019-02-20 lambdaMerge branch '468_oauth2_scopes' into 'develop'
2019-02-20 Ivan Tashkinov[#468] Merged `upstream/develop`.
2019-02-19 Mark FelderMerge branch 'develop' into fix/twittercards
2019-02-19 Ivan Tashkinov[#468] Merged `upstream/develop`.
2019-02-18 kaniiniMerge branch 'feature/jobs' into 'develop'
2019-02-18 kaniiniMerge branch 'patch-image-description' into 'develop'
2019-02-18 kaniiniMerge branch 'feature/add-oauth-tokens-endpoint' into...
2019-02-18 kaniiniMerge branch 'follow-request-count' into 'develop'
2019-02-17 lambdaMerge branch 'develop' into 'docs/add-clients-to-ex_doc'
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 lambdaMerge branch 'bugfix/oauth-token-padding' into 'develop'
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-14 Ivan Tashkinov[#468] Refactored OAuth scopes parsing / defaults handling.
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-11 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
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 alias/es
2019-02-09 Ivan Tashkinov[#468] Prototype of OAuth2 scopes support. TwitterAPI...
2019-02-09 lambdaMerge branch 'feature/keyword-policy' into 'develop'
2019-02-08 lambdaMerge branch 'fix/do-split-migration-for-local-users...
2019-02-08 lambdaMerge branch 'mark-streaming-feature-for-ios-apps'...
2019-02-08 lambdaMerge branch 'oauth2_strengthening' into 'develop'
2019-02-07 Ivan TashkinovOAuth2 security fixes: redirect URI validation, "Mastod...
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
next