dev

Clone or download

Read-only

Merge remote-tracking branch 'stable/master' into HEAD

* stable/master: (58 commits) This is Tuleap 6.5.99.42 This is Tuleap 6.5.99.41 Fixed 'news by mail' related message Extract strings in dedicated class for better clarity This is Tuleap 6.5.99.40 Send mail to project users This is Tuleap 6.5.99.39 Check that user can access the project Restrict the Tuleap REST API to HTTPS protocol Introduce versionning. Do not put the version number in the path. Allow plugins to inject resources in the REST API Create fake package core-rest to provide RESTΒ Api This is Tuleap 6.5.99.38 Fix fatal error when user is not LDAP but do browse a gerrit git repo This is Tuleap 6.5.99.37 Fix request #5326 : Cloning a project without Mediawiki service enabled does not create the Mediawiki database This is Tuleap 6.5.99.36 Fix fatal error on project creation This is Tuleap 6.5.99.35 ... Conflicts: plugins/agiledashboard/include/agiledashboardPlugin.class.php plugins/agiledashboard/include/autoload.php plugins/cardwall/include/Pane.class.php plugins/cardwall/include/autoload.php src/www/themes/common/css/style.css Change-Id: Icc1ab3b2840edecf3f2336c1418856e4c19ccd5b

Modified Files

Name
M ChangeLog +14 βˆ’6 Go to diff View file
M VERSION +1 βˆ’1 Go to diff View file
M plugins/IM/ChangeLog +3 βˆ’0 Go to diff View file
M plugins/IM/VERSION +1 βˆ’1 Go to diff View file
M plugins/IM/include/IMDataAccess.class.php +3 βˆ’2 Go to diff View file
M plugins/agiledashboard/ChangeLog +3 βˆ’0 Go to diff View file
M plugins/agiledashboard/VERSION +1 βˆ’1 Go to diff View file
A plugins/agiledashboard/include/AgileDashboard/REST/MilestoneResource.class.php +37 βˆ’0 Go to diff View file
A plugins/agiledashboard/include/AgileDashboard/REST/ResourcesInjector.class.php +31 βˆ’0 Go to diff View file
M plugins/agiledashboard/include/agiledashboardPlugin.class.php +9 βˆ’0 Go to diff View file
M plugins/agiledashboard/include/autoload.php +4 βˆ’2 Go to diff View file
M plugins/cardwall/ChangeLog +3 βˆ’0 Go to diff View file
M plugins/cardwall/VERSION +1 βˆ’1 Go to diff View file
D plugins/cardwall/include/ArtifactNodeTreeProvider.class.php +0 βˆ’71 Go to diff View file
D plugins/cardwall/include/BoardFactory.class.php +0 βˆ’50 Go to diff View file
M plugins/cardwall/include/CardController.class.php +3 βˆ’7 Go to diff View file
M plugins/cardwall/include/CardInCellPresenter.class.php +8 βˆ’0 Go to diff View file
R plugins/cardwall/include/CardInCellPresenterNodeFactory.class.php Go to diff View file
D plugins/cardwall/include/CardInCellPresenterCallback.class.php +0 βˆ’52 Go to diff View file
M plugins/cardwall/include/Cardwall_Renderer.class.php +6 βˆ’18 Go to diff View file
M plugins/cardwall/include/Pane.class.php +5 βˆ’35 Go to diff View file
A plugins/cardwall/include/PaneBoardBuilder.class.php +103 βˆ’0 Go to diff View file
A plugins/cardwall/include/RendererBoardBuilder.class.php +65 βˆ’0 Go to diff View file
M plugins/cardwall/include/Swimline.class.php +4 βˆ’6 Go to diff View file
M plugins/cardwall/include/SwimlineFactory.class.php +1 βˆ’27 Go to diff View file
A plugins/cardwall/include/SwimlineSolo.class.php +39 βˆ’0 Go to diff View file
A plugins/cardwall/include/SwimlineTrackerRenderer.class.php +44 βˆ’0 Go to diff View file
M plugins/cardwall/include/autoload.php +7 βˆ’6 Go to diff View file
M plugins/cardwall/tests/CardControllerTest.php +2 βˆ’3 Go to diff View file
D plugins/cardwall/tests/CardInCellPresenterCallbackTest.php +0 βˆ’70 Go to diff View file
A plugins/cardwall/tests/PaneBoardBuilderTest.php +95 βˆ’0 Go to diff View file
R plugins/cardwall/tests/ArtifactNodeTreeProviderTest.php Go to diff View file
M plugins/cardwall/www/js/CardsEditInPlace.js +14 βˆ’10 Go to diff View file
M plugins/git/ChangeLog +12 βˆ’0 Go to diff View file
M plugins/git/VERSION +1 βˆ’1 Go to diff View file
A plugins/git/bin/gl-admin-housekeeping.php +40 βˆ’0 Go to diff View file
M plugins/git/db/install.sql +7 βˆ’0 Go to diff View file
A plugins/git/db/mysql/updates/2013/201309301112_add_housekeeping_table.php +63 βˆ’0 Go to diff View file
M plugins/git/db/uninstall.sql +1 βˆ’0 Go to diff View file
M plugins/git/hooks/post-receive.php +4 βˆ’1 Go to diff View file
M plugins/git/include/Git/Ci/Launcher.class.php +6 βˆ’2 Go to diff View file
A plugins/git/include/Git/GitoliteHousekeeping/ChainOfResponsibility/CheckRunningEvents.class.php +53 βˆ’0 Go to diff View file
A plugins/git/include/Git/GitoliteHousekeeping/ChainOfResponsibility/CleanUpGitoliteAdminRepo.class.php +81 βˆ’0 Go to diff View file
A plugins/git/include/Git/GitoliteHousekeeping/ChainOfResponsibility/Command.class.php +51 βˆ’0 Go to diff View file
A plugins/git/include/Git/GitoliteHousekeeping/ChainOfResponsibility/DoNothing.class.php +34 βˆ’0 Go to diff View file
A plugins/git/include/Git/GitoliteHousekeeping/ChainOfResponsibility/EnableGitGc.class.php +49 βˆ’0 Go to diff View file
A plugins/git/include/Git/GitoliteHousekeeping/ChainOfResponsibility/ServiceRestarter.class.php +48 βˆ’0 Go to diff View file
A plugins/git/include/Git/GitoliteHousekeeping/ChainOfResponsibility/ServiceStopper.class.php +45 βˆ’0 Go to diff View file
A plugins/git/include/Git/GitoliteHousekeeping/GitoliteHousekeepingDao.class.php +37 βˆ’0 Go to diff View file
A plugins/git/include/Git/GitoliteHousekeeping/GitoliteHousekeepingGitGc.class.php +66 βˆ’0 Go to diff View file
A plugins/git/include/Git/GitoliteHousekeeping/GitoliteHousekeepingResponse.class.php +56 βˆ’0 Go to diff View file
A plugins/git/include/Git/GitoliteHousekeeping/GitoliteHousekeepingRunner.class.php +86 βˆ’0 Go to diff View file
M plugins/git/include/GitViews/RepoManagement/Pane/Delete.class.php +14 βˆ’3 Go to diff View file
M plugins/git/include/autoload.php +13 βˆ’2 Go to diff View file
M plugins/git/include/events/SystemEvent_GIT_REPO_UPDATE.class.php +9 βˆ’6 Go to diff View file
M plugins/git/include/gitPlugin.class.php +13 βˆ’2 Go to diff View file
M plugins/git/site-content/en_US/git.tab +1 βˆ’0 Go to diff View file
M plugins/git/site-content/fr_FR/git.tab +1 βˆ’0 Go to diff View file
A plugins/git/tests/Git/GitoliteHousekeeping/ChainOfResponsibility/CheckRunningEventsTest.php +61 βˆ’0 Go to diff View file
A plugins/git/tests/Git/GitoliteHousekeeping/ChainOfResponsibility/CleanUpGitoliteAdminRepoTest.php +89 βˆ’0 Go to diff View file
A plugins/git/tests/Git/GitoliteHousekeeping/ChainOfResponsibility/EnableGitGcTest.php +49 βˆ’0 Go to diff View file
A plugins/git/tests/Git/GitoliteHousekeeping/ChainOfResponsibility/ServiceRestarterTest.php +46 βˆ’0 Go to diff View file
A plugins/git/tests/Git/GitoliteHousekeeping/ChainOfResponsibility/ServiceStopperTest.php +49 βˆ’0 Go to diff View file
A plugins/git/tests/Git/GitoliteHousekeeping/ChainOfResponsibility/_fixtures/gitolite_admin.tgz Binary file Go to diff View file
A plugins/git/tests/Git/GitoliteHousekeeping/GitoliteHousekeepingGitGcTest.php +62 βˆ’0 Go to diff View file
A plugins/git/tests/Git/GitoliteHousekeeping/GitoliteHousekeepingRunnerTest.php +65 βˆ’0 Go to diff View file
M plugins/git/tests/events/SystemEvent_GIT_REPO_UPDATETest.php +4 βˆ’3 Go to diff View file
M plugins/ldap/ChangeLog +3 βˆ’0 Go to diff View file
M plugins/ldap/VERSION +1 βˆ’1 Go to diff View file
M plugins/ldap/include/LDAP_UserManager.class.php +1 βˆ’1 Go to diff View file
M plugins/mediawiki/ChangeLog +8 βˆ’0 Go to diff View file
M plugins/mediawiki/VERSION +1 βˆ’1 Go to diff View file
M plugins/mediawiki/include/mediawikiPlugin.class.php +68 βˆ’35 Go to diff View file
M plugins/tracker/ChangeLog +9 βˆ’0 Go to diff View file
M plugins/tracker/VERSION +1 βˆ’1 Go to diff View file
M plugins/tracker/include/tracker_permissions.php +4 βˆ’0 Go to diff View file
M plugins/tracker/tests/builders/aMockArtifact.php +7 βˆ’0 Go to diff View file
M site-content/en_US/my/my.tab +7 βˆ’0 Go to diff View file
M site-content/en_US/news/news.tab +4 βˆ’0 Go to diff View file
M site-content/fr_FR/my/my.tab +8 βˆ’1 Go to diff View file
M site-content/fr_FR/news/news.tab +5 βˆ’1 Go to diff View file
M src/common/Jenkins/Client.class.php +2 βˆ’4 Go to diff View file
A src/common/REST/BasicAuthentication.class.php +42 βˆ’0 Go to diff View file
A src/common/REST/ResourcesInjector.class.php +34 βˆ’0 Go to diff View file
A src/common/backend/BackendService.class.php +35 βˆ’0 Go to diff View file
M src/common/dao/CodendiDataAccess.class.php +10 βˆ’1 Go to diff View file
M src/common/dao/SystemEventDao.class.php +12 βˆ’0 Go to diff View file
M src/common/dao/include/DataAccess.class.php +23 βˆ’29 Go to diff View file
A src/common/dao/include/DataAccessCredentials.class.php +61 βˆ’0 Go to diff View file
M src/common/event/Event.class.php +11 βˆ’0 Go to diff View file
M src/common/include/Combined.class.php +2 βˆ’0 Go to diff View file
M src/common/mail/Codendi_Mail.class.php +1 βˆ’1 Go to diff View file
A src/common/mail/MassmailFormPresenter.class.php +51 βˆ’0 Go to diff View file
A src/common/mail/MassmailSender.class.php +61 βˆ’0 Go to diff View file
M src/common/project/Project.class.php +3 βˆ’2 Go to diff View file
A src/common/project/REST/ProjectInfoRepresentation.class.php +40 βˆ’0 Go to diff View file
A src/common/project/REST/v1/ProjectResource.class.php +94 βˆ’0 Go to diff View file
M src/common/project/autoload.php +4 βˆ’2 Go to diff View file
M src/common/system_event/IRunInAMutex.php +3 βˆ’6 Go to diff View file
A src/common/system_event/SystemEventProcess.class.php +36 βˆ’0 Go to diff View file
A src/common/system_event/SystemEventProcessApplicationOwner.class.php +35 βˆ’0 Go to diff View file
A src/common/system_event/SystemEventProcessManager.class.php +62 βˆ’0 Go to diff View file
A src/common/system_event/SystemEventProcessRoot.class.php +35 βˆ’0 Go to diff View file
M src/common/system_event/SystemEventProcessor.class.php +18 βˆ’4 Go to diff View file
M src/common/system_event/SystemEventProcessorMutex.class.php +8 βˆ’39 Go to diff View file
M src/common/system_event/SystemEventProcessor_ApplicationOwner.class.php +0 βˆ’6 Go to diff View file
M src/common/system_event/SystemEventProcessor_Root.class.php +13 βˆ’15 Go to diff View file
M src/common/system_event/include/SystemEvent_SYSTEM_CHECK.class.php +3 βˆ’1 Go to diff View file
M src/common/widget/Widget_MyProjects.class.php +21 βˆ’5 Go to diff View file
M src/etc/httpd.conf.dist +1 βˆ’1 Go to diff View file
M src/etc/httpd.conf.rhel6.dist +1 βˆ’1 Go to diff View file
M src/etc/local.inc.dist +5 βˆ’0 Go to diff View file
A src/etc/tuleap-api-explorer.conf.dist +7 βˆ’0 Go to diff View file
A src/templates/project/massmail.mustache +24 βˆ’0 Go to diff View file
M src/utils/process_system_events.php +4 βˆ’1 Go to diff View file
A src/www/api/.htaccess +7 βˆ’0 Go to diff View file
A src/www/api/VERSION +1 βˆ’0 Go to diff View file
A src/www/api/index.php +57 βˆ’0 Go to diff View file
M src/www/file/scripts/frs.js +1 βˆ’1 Go to diff View file
A src/www/my/massmail_to_project_members.php +51 βˆ’0 Go to diff View file
M src/www/news/news_utils.php +58 βˆ’1 Go to diff View file
M src/www/news/submit.php +14 βˆ’6 Go to diff View file
A src/www/scripts/bootstrap/bootstrap-modal.js +247 βˆ’0 Go to diff View file
A src/www/scripts/tuleap/massmail_initialize_ckeditor.js +28 βˆ’0 Go to diff View file
M src/www/themes/common/css/style.css +196 βˆ’0 Go to diff View file
M src/www/tracker/browse.php +1 βˆ’1 Go to diff View file
M tests/simpletest/common/Jenkins/ClientTest.php +1 βˆ’1 Go to diff View file
M tests/simpletest/common/dao/include/DataAccessTest.php +3 βˆ’1 Go to diff View file
A tests/simpletest/common/system_event/SystemEventProcessManagerTest.php +78 βˆ’0 Go to diff View file
M tests/simpletest/common/system_event/SystemEventProcessorMutexTest.php +12 βˆ’68 Go to diff View file
M tests/simpletest/common/system_event/SystemEventProcessor_RootTest.php +1 βˆ’0 Go to diff View file
M tools/plugins/maillog/db/install.sql +1 βˆ’0 Go to diff View file
M tools/plugins/maillog/db/uninstall.sql +3 βˆ’3 Go to diff View file
M tools/plugins/maillog/include/MaillogDao.class.php +7 βˆ’3 Go to diff View file
M tools/plugins/maillog/include/maillogPlugin.class.php +3 βˆ’0 Go to diff View file
M tools/rpm/Makefile +2 βˆ’0 Go to diff View file
M tools/rpm/tuleap.rhel6.spec +2 βˆ’0 Go to diff View file
M tools/rpm/tuleap.spec +31 βˆ’1 Go to diff View file