stable
Clone or download
Read-only
* stable/master: (43 commits) This is Tuleap 9.0.99.21 request #9505: FRS_Admin user group description is not user friendly This is Tuleap 9.0.99.20 This is Tuleap 9.0.99.19 You can choose to activate regexp even when admin doesn't allow it Cumulative Chart with d3 version 4.0 This is Tuleap 9.0.99.18 This is Tuleap 9.0.99.17 Uncheck repository regexp This is Tuleap 9.0.99.16 This is Tuleap 9.0.99.15 This is Tuleap 9.0.99.14 This is Tuleap 9.0.99.13 request #9373 Kanban realtime desync with column never loaded This is Tuleap 9.0.99.12 This is Tuleap 9.0.99.11 request #9515 Fatal error while listing permissions of a user group Take regexp in account This is Tuleap 9.0.99.10 This is Tuleap 9.0.99.9 ... Conflicts: .scss-lint.yml gulpfile.js package.json plugins/git/templates/admin-plugin.mustache src/common/autoload.php
Modified Files
| Name | ||||
|---|---|---|---|---|
| M | .scss-lint.yml | +1 | −1 | Go to diff View file |
| M | ChangeLog | +24 | −1 | Go to diff View file |
| M | Makefile | +4 | −4 | Go to diff View file |
| M | VERSION | +1 | −1 | Go to diff View file |
| M | docker-compose.yml | +2 | −0 | Go to diff View file |
| M | gulpfile.js | +18 | −5 | Go to diff View file |
| M | package.json | +4 | −2 | Go to diff View file |
| M | plugins/agiledashboard/ChangeLog | +19 | −13 | Go to diff View file |
| M | plugins/agiledashboard/VERSION | +1 | −1 | Go to diff View file |
| M | plugins/agiledashboard/include/AgileDashboard/REST/v1/Kanban/KanbanResource.php | +88 | −20 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/bower.json | +3 | −2 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/build.config.js | +2 | −4 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/po/fr.po | +12 | −0 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/po/template.pot | +7 | −3 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/app-kanban-controller.js | +25 | −397 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/app-kanban-controller.spec.js | +11 | −8 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/app.js | +1 | −2 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/column-collection-service.js | +92 | −1 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/column-collection-service.spec.js | +126 | −0 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/dropped-service.js | +6 | −4 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/dropped-service.spec.js | +15 | −7 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/jwt/jwt-service.js | +30 | −25 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/jwt/jwt.js | +3 | −3 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/kanban-column/kanban-column-controller.js | +2 | −1 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/kanban-column/kanban-column-controller.spec.js | +2 | −1 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/kanban-column/kanban-column-service.js | +69 | −6 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/kanban-column/kanban-column-service.spec.js | +74 | −4 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/kanban-item/kanban-item-rest-service.js | +14 | −3 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/kanban-item/kanban-item-rest-service.spec.js | +52 | −19 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/kanban-service.js | +30 | −7 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/kanban-service.spec.js | +26 | −12 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/kanban.scss | +2 | −0 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/kanban.tpl.html | +2 | −1 | Go to diff View file |
| A | plugins/agiledashboard/www/js/kanban/src/app/reports-modal/_diagram.scss | +130 | −0 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/reports-modal/_reports-modal.scss | +16 | −44 | Go to diff View file |
| A | plugins/agiledashboard/www/js/kanban/src/app/reports-modal/diagram-directive.js | +671 | −0 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/reports-modal/reports-modal-controller.js | +7 | −115 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/reports-modal/reports-modal-controller.spec.js | +14 | −8 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/reports-modal/reports-modal.tpl.html | +21 | −20 | Go to diff View file |
| A | plugins/agiledashboard/www/js/kanban/src/app/socket/_socket.scss | +16 | −0 | Go to diff View file |
| A | plugins/agiledashboard/www/js/kanban/src/app/socket/socket-config.js | +11 | −0 | Go to diff View file |
| A | plugins/agiledashboard/www/js/kanban/src/app/socket/socket-disconnect-directive.js | +20 | −0 | Go to diff View file |
| A | plugins/agiledashboard/www/js/kanban/src/app/socket/socket-disconnect.tpl.html | +4 | −0 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/socket/socket-factory.js | +22 | −51 | Go to diff View file |
| A | plugins/agiledashboard/www/js/kanban/src/app/socket/socket-service.js | +319 | −0 | Go to diff View file |
| M | plugins/agiledashboard/www/js/kanban/src/app/socket/socket.js | +7 | −5 | Go to diff View file |
| M | plugins/artifactsfolders/ChangeLog | +27 | −27 | Go to diff View file |
| M | plugins/cardwall/ChangeLog | +3 | −3 | Go to diff View file |
| M | plugins/docman/ChangeLog | +1 | −1 | Go to diff View file |
| M | plugins/frs/ChangeLog | +1 | −1 | Go to diff View file |
| M | plugins/git/ChangeLog | +39 | −12 | Go to diff View file |
| M | plugins/git/VERSION | +1 | −1 | Go to diff View file |
| M | plugins/git/db/install.sql | +9 | −1 | Go to diff View file |
| A | plugins/git/db/mysql/updates/2016/201610171336_create_plugin_git_fine_grained_regexp_enabled.php | +53 | −0 | Go to diff View file |
| A | plugins/git/db/mysql/updates/2016/201610171725_create_plugin_git_repository_fine_grained_regexp.php | +52 | −0 | Go to diff View file |
| M | plugins/git/db/uninstall.sql | +2 | −0 | Go to diff View file |
| M | plugins/git/include/Git.class.php | +50 | −12 | Go to diff View file |
| M | plugins/git/include/Git/AdminPresenter.class.php | +9 | −3 | Go to diff View file |
| M | plugins/git/include/Git/AdminRouter.class.php | +27 | −3 | Go to diff View file |
| A | plugins/git/include/Git/GeneralSettingsController.php | +88 | −0 | Go to diff View file |
| A | plugins/git/include/Git/GeneralSettingsPresenter.php | +51 | −0 | Go to diff View file |
| M | plugins/git/include/Git/Gitolite/Gitolite3LogParser.php | +9 | −1 | Go to diff View file |
| M | plugins/git/include/Git/Permissions/DefaultFineGrainedPermissionFactory.php | +3 | −3 | Go to diff View file |
| M | plugins/git/include/Git/Permissions/FineGrainedPatternValidator.php | +11 | −1 | Go to diff View file |
| M | plugins/git/include/Git/Permissions/FineGrainedPermissionFactory.php | +3 | −3 | Go to diff View file |
| A | plugins/git/include/Git/Permissions/FineGrainedRegexpValidator.php | +40 | −0 | Go to diff View file |
| A | plugins/git/include/Git/Permissions/PatternValidator.php | +65 | −0 | Go to diff View file |
| A | plugins/git/include/Git/Permissions/RegexpFineGrainedDao.php | +41 | −0 | Go to diff View file |
| A | plugins/git/include/Git/Permissions/RegexpFineGrainedDisabler.php | +42 | −0 | Go to diff View file |
| A | plugins/git/include/Git/Permissions/RegexpFineGrainedEnabler.php | +55 | −0 | Go to diff View file |
| A | plugins/git/include/Git/Permissions/RegexpFineGrainedRetriever.php | +55 | −0 | Go to diff View file |
| A | plugins/git/include/Git/Permissions/RegexpPermissionFilter.php | +68 | −0 | Go to diff View file |
| A | plugins/git/include/Git/Permissions/RegexpRepositoryDao.php | +57 | −0 | Go to diff View file |
| M | plugins/git/include/GitActions.class.php | +43 | −3 | Go to diff View file |
| M | plugins/git/include/GitForkPermissionsManager.class.php | +24 | −3 | Go to diff View file |
| M | plugins/git/include/GitPresenters/AccessControlPresenter.class.php | +34 | −6 | Go to diff View file |
| M | plugins/git/include/GitPresenters/AdminDefaultSettingsPresenter.php | +34 | −3 | Go to diff View file |
| M | plugins/git/include/GitViews.class.php | +19 | −4 | Go to diff View file |
| M | plugins/git/include/GitViews/RepoManagement/Pane/AccessControl.class.php | +21 | −8 | Go to diff View file |
| M | plugins/git/include/GitViews/RepoManagement/RepoManagement.class.php | +11 | −3 | Go to diff View file |
| M | plugins/git/include/History/Dao.php | +1 | −1 | Go to diff View file |
| M | plugins/git/include/History/GitPhpAccessLogger.php | +1 | −1 | Go to diff View file |
| M | plugins/git/include/autoload.php | +12 | −2 | Go to diff View file |
| M | plugins/git/include/gitPlugin.class.php | +75 | −6 | Go to diff View file |
| M | plugins/git/site-content/en_US/git.tab | +14 | −0 | Go to diff View file |
| M | plugins/git/site-content/en_US/script_locale.txt | +2 | −1 | Go to diff View file |
| M | plugins/git/site-content/fr_FR/git.tab | +13 | −0 | Go to diff View file |
| M | plugins/git/site-content/fr_FR/script_locale.txt | +2 | −1 | Go to diff View file |
| A | plugins/git/templates/admin-plugin-general.mustache | +28 | −0 | Go to diff View file |
| M | plugins/git/templates/admin-plugin.mustache | +6 | −0 | Go to diff View file |
| M | plugins/git/templates/fine_grained.mustache | +105 | −69 | Go to diff View file |
| A | plugins/git/templates/settings/popover-remove-non-valid-regexp-permission.mustache | +22 | −0 | Go to diff View file |
| M | plugins/git/tests/Git/Gitolite/Gitolite3LogParserTest.php | +19 | −9 | Go to diff View file |
| M | plugins/git/tests/Git/Permissions/DefaultFineGrainedPermissionFactoryTest.php | +5 | −1 | Go to diff View file |
| M | plugins/git/tests/Git/Permissions/FineGrainedPatternValidatorTest.php | +16 | −0 | Go to diff View file |
| M | plugins/git/tests/Git/Permissions/FineGrainedPermissionFactoryTest.php | +5 | −1 | Go to diff View file |
| A | plugins/git/tests/Git/Permissions/FineGrainedRegexpValidatorTest.php | +79 | −0 | Go to diff View file |
| A | plugins/git/tests/Git/Permissions/PatternValidatorTest.php | +88 | −0 | Go to diff View file |
| A | plugins/git/tests/Git/Permissions/RegexpPermissionFilterTest.php | +122 | −0 | Go to diff View file |
| M | plugins/git/tests/GitActionsTest.php | +20 | −4 | Go to diff View file |
| M | plugins/git/tests/GitTest.php | +5 | −1 | Go to diff View file |
| M | plugins/git/tests/rest/GitDataBuilder.php | +14 | −1 | Go to diff View file |
| M | plugins/git/www/scripts/permissions.js | +46 | −1 | Go to diff View file |
| M | plugins/git/www/themes/default/css/style.scss | +39 | −3 | Go to diff View file |
| M | plugins/hudson/ChangeLog | +1 | −1 | Go to diff View file |
| M | plugins/ldap/ChangeLog | +5 | −5 | Go to diff View file |
| M | plugins/statistics/ChangeLog | +2 | −2 | Go to diff View file |
| M | plugins/svn/ChangeLog | +11 | −5 | Go to diff View file |
| M | plugins/svn/VERSION | +1 | −1 | Go to diff View file |
| M | plugins/svn/include/events/SystemEvent_SVN_DELETE_REPOSITORY.class.php | +1 | −1 | Go to diff View file |
| M | plugins/svn/include/events/SystemEvent_SVN_RESTORE_REPOSITORY.php | +1 | −1 | Go to diff View file |
| M | plugins/svn/include/svnPlugin.class.php | +37 | −0 | Go to diff View file |
| M | plugins/tracker/ChangeLog | +27 | −24 | Go to diff View file |
| M | plugins/tracker/VERSION | +1 | −1 | Go to diff View file |
| M | plugins/tracker/include/Tracker/Artifact/Tracker_Artifact_Changeset.class.php | +1 | −1 | Go to diff View file |
| M | plugins/tracker/include/Tracker/Artifact/Tracker_Artifact_ChangesetValue.class.php | +11 | −11 | Go to diff View file |
| M | plugins/tracker/include/Tracker/Artifact/Tracker_Artifact_ChangesetValue_ArtifactLink.class.php | +3 | −11 | Go to diff View file |
| M | plugins/tracker/include/Tracker/Artifact/Tracker_Artifact_ChangesetValue_Date.class.php | +5 | −12 | Go to diff View file |
| M | plugins/tracker/include/Tracker/Artifact/Tracker_Artifact_ChangesetValue_File.class.php | +79 | −29 | Go to diff View file |
| M | plugins/tracker/include/Tracker/Artifact/Tracker_Artifact_ChangesetValue_List.class.php | +3 | −10 | Go to diff View file |
| M | plugins/tracker/include/Tracker/Artifact/Tracker_Artifact_ChangesetValue_Numeric.class.php | +3 | −10 | Go to diff View file |
| M | plugins/tracker/include/Tracker/Artifact/Tracker_Artifact_ChangesetValue_PermissionsOnArtifact.class.php | +3 | −10 | Go to diff View file |
| M | plugins/tracker/include/Tracker/Artifact/Tracker_Artifact_ChangesetValue_Text.class.php | +3 | −11 | Go to diff View file |
| M | plugins/tracker/include/Tracker/FormElement/Tracker_FormElement_Field_ArtifactLink.class.php | +1 | −0 | Go to diff View file |
| M | plugins/tracker/include/Tracker/FormElement/Tracker_FormElement_Field_Computed.class.php | +1 | −1 | Go to diff View file |
| M | plugins/tracker/include/Tracker/FormElement/Tracker_FormElement_Field_Date.class.php | +1 | −1 | Go to diff View file |
| M | plugins/tracker/include/Tracker/FormElement/Tracker_FormElement_Field_File.class.php | +9 | −6 | Go to diff View file |
| M | plugins/tracker/include/Tracker/FormElement/Tracker_FormElement_Field_Float.class.php | +1 | −1 | Go to diff View file |
| M | plugins/tracker/include/Tracker/FormElement/Tracker_FormElement_Field_Integer.class.php | +1 | −1 | Go to diff View file |
| M | plugins/tracker/include/Tracker/FormElement/Tracker_FormElement_Field_LastUpdateDate.class.php | +1 | −1 | Go to diff View file |
| M | plugins/tracker/include/Tracker/FormElement/Tracker_FormElement_Field_List.class.php | +1 | −1 | Go to diff View file |
| M | plugins/tracker/include/Tracker/FormElement/Tracker_FormElement_Field_OpenList.class.php | +1 | −1 | Go to diff View file |
| M | plugins/tracker/include/Tracker/FormElement/Tracker_FormElement_Field_PermissionsOnArtifact.class.php | +1 | −1 | Go to diff View file |
| M | plugins/tracker/include/Tracker/FormElement/Tracker_FormElement_Field_String.class.php | +1 | −0 | Go to diff View file |
| M | plugins/tracker/include/Tracker/FormElement/Tracker_FormElement_Field_SubmittedOn.class.php | +4 | −4 | Go to diff View file |
| M | plugins/tracker/include/Tracker/FormElement/Tracker_FormElement_Field_Text.class.php | +1 | −1 | Go to diff View file |
| M | plugins/tracker/site-content/en_US/tracker.tab | +2 | −0 | Go to diff View file |
| M | plugins/tracker/site-content/fr_FR/tracker.tab | +2 | −0 | Go to diff View file |
| M | plugins/tracker/tests/Artifact/XMLExportTest.php | +8 | −7 | Go to diff View file |
| M | plugins/tracker/tests/ChangesetValueComputedTest.php | +16 | −14 | Go to diff View file |
| M | plugins/tracker/tests/Tracker/XML/Exporter/ArtifactAttachmentExporterTest.php | +3 | −3 | Go to diff View file |
| M | plugins/tracker/tests/Tracker/XML/Exporter/ChangesetValue/ChangesetValueComputedXMLExporterTest.php | +5 | −4 | Go to diff View file |
| M | plugins/tracker/tests/Tracker/XML/Exporter/ChangesetValueXMLExporterVisitorTest.php | +5 | −3 | Go to diff View file |
| M | plugins/tracker/tests/Tracker/XML/Exporter/ChangesetValuesXMLExporterTest.php | +4 | −2 | Go to diff View file |
| M | plugins/tracker/tests/Tracker/XML/Exporter/ChangesetXMLExporterTest.php | +4 | −2 | Go to diff View file |
| M | plugins/tracker/tests/Tracker_ArtifactTest.php | +2 | −2 | Go to diff View file |
| M | plugins/tracker/tests/Tracker_Artifact_ChangesetValue_ArtifactLinkTest.php | +1 | −1 | Go to diff View file |
| M | plugins/tracker/tests/Tracker_Artifact_ChangesetValue_DateTest.php | +9 | −7 | Go to diff View file |
| M | plugins/tracker/tests/Tracker_Artifact_ChangesetValue_FileTest.php | +20 | −12 | Go to diff View file |
| M | plugins/tracker/tests/Tracker_Artifact_ChangesetValue_FloatTest.php | +16 | −14 | Go to diff View file |
| M | plugins/tracker/tests/Tracker_Artifact_ChangesetValue_IntegerTest.php | +10 | −8 | Go to diff View file |
| M | plugins/tracker/tests/Tracker_Artifact_ChangesetValue_ListTest.php | +20 | −18 | Go to diff View file |
| M | plugins/tracker/tests/Tracker_Artifact_ChangesetValue_OpenListTest.php | +13 | −11 | Go to diff View file |
| M | plugins/tracker/tests/Tracker_Artifact_ChangesetValue_StringTest.php | +1 | −1 | Go to diff View file |
| M | plugins/tracker/tests/Tracker_Artifact_ChangesetValue_TextTest.php | +10 | −6 | Go to diff View file |
| M | plugins/tracker/tests/Tracker_FormElement_Field_ArtifactLinkTest.php | +7 | −2 | Go to diff View file |
| M | plugins/tracker/tests/Tracker_FormElement_Field_DateTest.php | +1 | −1 | Go to diff View file |
| M | plugins/tracker/tests/Tracker_FormElement_Field_FileTest.php | +2 | −2 | Go to diff View file |
| M | plugins/tracker/tests/Tracker_FormElement_Field_FloatTest.php | +1 | −1 | Go to diff View file |
| M | plugins/tracker/tests/Tracker_FormElement_Field_IntegerTest.php | +1 | −1 | Go to diff View file |
| M | plugins/tracker/tests/Tracker_FormElement_Field_ListTest.php | +2 | −2 | Go to diff View file |
| M | plugins/tracker/tests/Tracker_FormElement_Field_OpenListTest.php | +5 | −4 | Go to diff View file |
| M | plugins/tracker/tests/Tracker_FormElement_Field_SelectboxTest.php | +1 | −1 | Go to diff View file |
| M | plugins/tracker/tests/Tracker_FormElement_Field_TextTest.php | +1 | −1 | Go to diff View file |
| M | plugins/tracker/tests/builders/aChangesetValue.php | +3 | −3 | Go to diff View file |
| M | plugins/tracker_encryption/ChangeLog | +1 | −1 | Go to diff View file |
| M | src/common/autoload.php | +3 | −3 | Go to diff View file |
| M | src/common/dao/UserDao.class.php | +9 | −8 | Go to diff View file |
| M | src/common/frs/FRSFileFactory.class.php | +9 | −7 | Go to diff View file |
| M | src/common/plugin/Plugin.class.php | +5 | −0 | Go to diff View file |
| M | src/common/project/Admin/ProjectUGroup/View/Permissions.class.php | +94 | −56 | Go to diff View file |
| M | src/common/project/ProjectCreationData.class.php | +14 | −0 | Go to diff View file |
| M | src/common/project/ProjectCreator.class.php | +45 | −6 | Go to diff View file |
| M | src/common/svn/ApacheConfGenerator.php | +1 | −1 | Go to diff View file |
| M | src/common/system_event/SystemEventProcessor_Factory.php | +1 | −1 | Go to diff View file |
| M | src/common/system_event/SystemEventProcessor_Root.class.php | +1 | −1 | Go to diff View file |
| A | src/db/mysql/updates/2016/201610241145_update_frs_admin_description.php | +55 | −0 | Go to diff View file |
| M | src/etc/local.inc.dist | +0 | −1 | Go to diff View file |
| M | src/utils/fileforge.pl | +9 | −49 | Go to diff View file |
| M | src/utils/svn/force_refresh_codendi_svnroot.php | +1 | −1 | Go to diff View file |
| M | src/www/file/file_utils.php | +0 | −24 | Go to diff View file |
| M | src/www/project/admin/permissions.php | +12 | −2 | Go to diff View file |
| M | src/www/themes/FlamingParrot/ChangeLog | +6 | −0 | Go to diff View file |
| M | src/www/themes/FlamingParrot/VERSION | +1 | −1 | Go to diff View file |
| A | src/www/themes/FlamingParrot/css/utils/_admin.scss | +5 | −0 | Go to diff View file |
| M | src/www/themes/FlamingParrot/css/utils/_definitions.scss | +1 | −0 | Go to diff View file |
| M | src/www/themes/common/css/utils/_admin.scss | +21 | −5 | Go to diff View file |
| M | tests/integration/_fixtures/fake_project/wiki_pages.xml | +1 | −1 | Go to diff View file |
| M | tests/simpletest/common/frs/FRSFileFactoryTest.php | +4 | −14 | Go to diff View file |
| M | tests/simpletest/common/system_event/SystemEventProcessor_RootTest.php | +1 | −3 | Go to diff View file |
| M | tests/simpletest/common/user/UserAccountValidityTest.php | +6 | −5 | Go to diff View file |
| M | tools/rpm/tuleap.rhel6.spec | +1 | −1 | Go to diff View file |
| M | tools/utils/gerrit_setup/Readme.md | +6 | −6 | Go to diff View file |
| M | tools/utils/gerrit_setup/setup_gerrit.sh | +2 | −2 | Go to diff View file |
| A | tools/utils/githooks/pre-commit-03-scss-lint | +90 | −0 | Go to diff View file |
| M | tools/utils/tuleap-gulp-build.js | +23 | −10 | Go to diff View file |