stable

Clone or download

Read-only

Merge commit 'refs/changes/06/5106/6' of ssh://gerrit.tuleap.net:29418/tuleap into tuleap-stable-master

* ssh://gerrit.tuleap.net:29418/tuleap: story #8631: Add the possibility to remove a link between a user account and an OpenID Connect provider Change-Id: I4d431a1afbc0aa38b9fa6aae38effc3b7380a9a2

Modified Files

Name
M plugins/git/templates/gerrit_as_third_party.mustache +11 −9 Go to diff View file
M plugins/openidconnectclient/db/install.sql +1 −0 Go to diff View file
A plugins/openidconnectclient/db/mysql/2016/201602181030_add_column_last_used_user_mapping.php +57 −0 Go to diff View file
M plugins/openidconnectclient/include/OpenIDConnectClient/AccountLinker/Controller.php +5 −3 Go to diff View file
M plugins/openidconnectclient/include/OpenIDConnectClient/Login/Controller.php +12 −3 Go to diff View file
M plugins/openidconnectclient/include/OpenIDConnectClient/Router.php +17 −4 Go to diff View file
A plugins/openidconnectclient/include/OpenIDConnectClient/UserMapping/Controller.php +103 −0 Go to diff View file
M plugins/openidconnectclient/include/OpenIDConnectClient/UserMapping/UserMapping.php +7 −1 Go to diff View file
M plugins/openidconnectclient/include/OpenIDConnectClient/UserMapping/UserMappingDao.class.php +30 −7 Go to diff View file
M plugins/openidconnectclient/include/OpenIDConnectClient/UserMapping/UserMappingManager.php +63 −6 Go to diff View file
A plugins/openidconnectclient/include/OpenIDConnectClient/UserMapping/UserMappingUsage.php +52 −0 Go to diff View file
A plugins/openidconnectclient/include/OpenIDConnectClient/UserMapping/UserPreferencesPresenter.php +72 −0 Go to diff View file
M plugins/openidconnectclient/include/autoload.php +6 −3 Go to diff View file
M plugins/openidconnectclient/include/openidconnectclientPlugin.class.php +32 −1 Go to diff View file
M plugins/openidconnectclient/site-content/en_US/openidconnectclient.tab +6 −1 Go to diff View file
M plugins/openidconnectclient/site-content/fr_FR/openidconnectclient.tab +6 −1 Go to diff View file
A plugins/openidconnectclient/templates/user_preference.mustache +20 −0 Go to diff View file
M plugins/openidconnectclient/tests/RouterTest.php +2 −1 Go to diff View file
A plugins/openidconnectclient/www/themes/FlamingParrot/css/style.less +81 −0 Go to diff View file
A plugins/openidconnectclient/www/themes/default/css/style.less +31 −0 Go to diff View file
M src/common/include/Codendi_Request.class.php +7 −0 Go to diff View file
M src/templates/user/third-party-applications.mustache +2 −4 Go to diff View file
M src/www/themes/common/css/utils/account-maintenance.less +12 −0 Go to diff View file