stable
Clone or download
Read-only
Merge commit 'refs/changes/15/3715/4' of ssh://gerrit.tuleap.net:29418/tuleap into HEAD
* ssh://gerrit.tuleap.net:29418/tuleap: story #7709: refactor plugin restriction by project Conflicts: src/common/autoload.php Change-Id: Ibf2f2310cd30a2bdc96912be370a22e19ca0927c
Modified Files
| Name | ||||
|---|---|---|---|---|
| M | plugins/git/include/Git/AdminAllowedProjectsPresenter.class.php | +42 | −31 | Go to diff View file |
| M | plugins/git/include/Git/AdminMirrorController.class.php | +15 | −26 | Go to diff View file |
| M | plugins/git/include/Git/Mirror/MirrorResourceRestrictor.class.php | +7 | −7 | Go to diff View file |
| M | plugins/git/include/Git/Mirror/RestrictedMirrorDao.class.php | +14 | −28 | Go to diff View file |
| M | plugins/git/include/gitPlugin.class.php | +0 | −1 | Go to diff View file |
| M | plugins/git/site-content/en_US/git.tab | +2 | −1 | Go to diff View file |
| M | plugins/git/site-content/fr_FR/git.tab | +3 | −2 | Go to diff View file |
| M | plugins/git/www/themes/default/css/style.less | +1 | −70 | Go to diff View file |
| A | plugins/pluginsadministration/include/ManageAllowedProjectsPresenter.class.php | +140 | −0 | Go to diff View file |
| M | plugins/pluginsadministration/include/PluginsAdministration.class.php | +9 | −0 | Go to diff View file |
| M | plugins/pluginsadministration/include/PluginsAdministrationActions.class.php | +148 | −5 | Go to diff View file |
| M | plugins/pluginsadministration/include/PluginsAdministrationViews.class.php | +47 | −90 | Go to diff View file |
| M | plugins/pluginsadministration/include/autoload.php | +3 | −2 | Go to diff View file |
| M | plugins/pluginsadministration/site-content/en_US/pluginsAdministration.tab | +27 | −0 | Go to diff View file |
| M | plugins/pluginsadministration/site-content/fr_FR/pluginsAdministration.tab | +28 | −0 | Go to diff View file |
| M | src/common/autoload.php | +5 | −2 | Go to diff View file |
| M | src/common/dao/PluginDao.class.php | +6 | −54 | Go to diff View file |
| A | src/common/dao/RestrictedPluginDao.class.php | +93 | −0 | Go to diff View file |
| M | src/common/include/Combined.class.php | +2 | −1 | Go to diff View file |
| M | src/common/plugin/PluginFactory.class.php | +67 | −34 | Go to diff View file |
| A | src/common/plugin/PluginResourceRestrictor.class.php | +72 | −0 | Go to diff View file |
| A | src/common/resource_restrictor/RestrictedResourceDao.class.php | +66 | −0 | Go to diff View file |
| R | plugins/git/templates/admin-plugin-manage-allowed-projects.mustache | Go to diff View file | ||
| R | plugins/git/www/scripts/admin-manage-allowed-projects.js | Go to diff View file | ||
| A | src/www/themes/common/css/utils/resource-restrictor.less | +68 | −0 | Go to diff View file |
| M | src/www/themes/common/css/utils/utils.less | +1 | −0 | Go to diff View file |
| M | tests/simpletest/common/plugin/PluginFactoryTest.php | +22 | −23 | Go to diff View file |