stable
Clone or download
Read-only
Merge commit 'refs/changes/86/5286/8' of ssh://gerrit.tuleap.net:29418/tuleap into tuleap-stable-master
* ssh://gerrit.tuleap.net:29418/tuleap: story #8633: openid providers can now have an icon and a color Conflicts: plugins/openidconnectclient/db/install.sql Change-Id: I85bc8c833e12e22707758cc0bf745a24bacd8c09
Modified Files
| Name | ||||
|---|---|---|---|---|
| M | plugins/openidconnectclient/db/install.sql | +3 | −1 | Go to diff View file |
| A | plugins/openidconnectclient/db/mysql/2016/201603171433_add_icon_color_columns.php | +52 | −0 | Go to diff View file |
| A | plugins/openidconnectclient/include/OpenIDConnectClient/Administration/ColorPresenter.php | +42 | −0 | Go to diff View file |
| A | plugins/openidconnectclient/include/OpenIDConnectClient/Administration/ColorPresenterFactory.php | +72 | −0 | Go to diff View file |
| M | plugins/openidconnectclient/include/OpenIDConnectClient/Administration/Controller.php | +48 | −6 | Go to diff View file |
| A | plugins/openidconnectclient/include/OpenIDConnectClient/Administration/IconPresenter.php | +42 | −0 | Go to diff View file |
| A | plugins/openidconnectclient/include/OpenIDConnectClient/Administration/IconPresenterFactory.php | +68 | −0 | Go to diff View file |
| M | plugins/openidconnectclient/include/OpenIDConnectClient/Administration/Presenter.php | +37 | −14 | Go to diff View file |
| A | plugins/openidconnectclient/include/OpenIDConnectClient/Administration/ProviderPresenter.php | +85 | −0 | Go to diff View file |
| M | plugins/openidconnectclient/include/OpenIDConnectClient/Login/ConnectorPresenterBuilder.php | +3 | −1 | Go to diff View file |
| M | plugins/openidconnectclient/include/OpenIDConnectClient/Provider/Provider.php | +16 | −2 | Go to diff View file |
| M | plugins/openidconnectclient/include/OpenIDConnectClient/Provider/ProviderDao.php | +16 | −6 | Go to diff View file |
| M | plugins/openidconnectclient/include/OpenIDConnectClient/Provider/ProviderManager.php | +27 | −10 | Go to diff View file |
| M | plugins/openidconnectclient/include/autoload.php | +7 | −2 | Go to diff View file |
| M | plugins/openidconnectclient/include/openidconnectclientPlugin.class.php | +14 | −3 | Go to diff View file |
| M | plugins/openidconnectclient/site-content/en_US/openidconnectclient.tab | +3 | −0 | Go to diff View file |
| M | plugins/openidconnectclient/site-content/fr_FR/openidconnectclient.tab | +4 | −1 | Go to diff View file |
| M | plugins/openidconnectclient/templates/administration-providers-modal-create.mustache | +34 | −2 | Go to diff View file |
| M | plugins/openidconnectclient/templates/administration-providers-modal-update.mustache | +43 | −12 | Go to diff View file |
| M | plugins/openidconnectclient/templates/administration-providers.mustache | +6 | −3 | Go to diff View file |
| M | plugins/openidconnectclient/templates/login_connector.mustache | +1 | −1 | Go to diff View file |
| M | plugins/openidconnectclient/templates/user_preference.mustache | +2 | −2 | Go to diff View file |
| M | plugins/openidconnectclient/tests/Provider/ProviderManagerTest.php | +13 | −5 | Go to diff View file |
| A | plugins/openidconnectclient/www/scripts/open-id-connect-client.js | +79 | −0 | Go to diff View file |
| M | plugins/openidconnectclient/www/themes/default/css/style.less | +189 | −2 | Go to diff View file |