dev

Clone or download

Read-only

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

* stable/master: Add missing plugin entries This is Tuleap 6.9.99.5 Create a dedicated plugin to manage interaction with proftpd This is Tuleap 6.9.99.4 Tuleap 6.9.99.3 Fix REST tests Edit button in Tracker read only view have the same format as other buttons Display real values on burndown Fix permission check for restricted & private projects Add OPTIONS|GET /milestones/:id/burndown Verify the request before going RESTFul Use d3 to display a burndown chart in standup view Tuleap 6.9.99.2 Tuleap 6.9.99.1 Fix request #5856 - Tracker v5: Description of attachment not displayed Remove chef and vagrant stuff from repository Conflicts: plugins/agiledashboard/include/autoload.php src/common/autoload.php Change-Id: Ic7b75917c23d5c2cd5d380c5d1c0ea8ec4dffb0a

Modified Files

Name
D .gitmodules +0 −3 Go to diff View file
M ChangeLog +17 −0 Go to diff View file
M VERSION +1 −1 Go to diff View file
D Vagrantfile +0 −72 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
M plugins/agiledashboard/include/AgileDashboard/REST/v1/MilestoneRepresentation.class.php +10 −0 Go to diff View file
M plugins/agiledashboard/include/AgileDashboard/REST/v1/MilestoneResource.class.php +47 −0 Go to diff View file
A plugins/agiledashboard/include/AgileDashboard/REST/v1/MilestonesBurndownResource.class.php +58 −0 Go to diff View file
M plugins/agiledashboard/include/AgileDashboard/REST/v1/PlanningResource.class.php +5 −8 Go to diff View file
M plugins/agiledashboard/include/autoload.php +3 −2 Go to diff View file
M plugins/agiledashboard/include/constants.php +23 −0 Go to diff View file
M plugins/boomerang/ChangeLog +3 −0 Go to diff View file
M plugins/boomerang/VERSION +1 −1 Go to diff View file
M plugins/boomerang/include/boomerangPlugin.class.php +0 −8 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
M plugins/cardwall/include/REST/v1/CardsResource.class.php +2 −0 Go to diff View file
M plugins/cardwall/templates/agiledashboard-milestone-info.mustache +3 −0 Go to diff View file
M plugins/cardwall/www/js/cardwall.js +130 −0 Go to diff View file
M plugins/cardwall/www/js/fullscreen.js +9 −2 Go to diff View file
M plugins/cardwall/www/themes/default/css/style.less +56 −3 Go to diff View file
A plugins/proftpd/ChangeLog +2 −0 Go to diff View file
A plugins/proftpd/VERSION +1 −0 Go to diff View file
A plugins/proftpd/include/ProftpdPluginDescriptor.class.php +31 −0 Go to diff View file
A plugins/proftpd/include/ProftpdPluginInfo.class.php +28 −0 Go to diff View file
A plugins/proftpd/include/autoload.php +20 −0 Go to diff View file
A plugins/proftpd/include/proftpdPlugin.class.php +29 −0 Go to diff View file
A plugins/proftpd/site-content/en_US/proftpd.tab +2 −0 Go to diff View file
A plugins/proftpd/site-content/fr_FR/proftpd.tab +2 −0 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
A plugins/tracker/include/REST/Artifact/BurndownRepresentation.class.php +43 −0 Go to diff View file
M plugins/tracker/include/REST/v1/ArtifactsResource.class.php +6 −15 Go to diff View file
M plugins/tracker/include/REST/v1/TrackersResource.class.php +8 −15 Go to diff View file
M plugins/tracker/include/Tracker/Artifact/Renderer/ReadOnlyRenderer.class.php +15 −10 Go to diff View file
M plugins/tracker/include/Tracker/Chart/Data/Burndown.class.php +17 −0 Go to diff View file
M plugins/tracker/include/Tracker/FormElement/Tracker_FormElement_Field_Burndown.class.php +39 −10 Go to diff View file
M plugins/tracker/include/Tracker/FormElement/Tracker_FormElement_Field_File.class.php +3 −0 Go to diff View file
M plugins/tracker/include/autoload.php +3 −2 Go to diff View file
M plugins/tracker/include/trackerPlugin.class.php +26 −2 Go to diff View file
M plugins/tracker/www/themes/default/css/style.less +3 −0 Go to diff View file
A src/common/REST/GateKeeper.class.php +98 −0 Go to diff View file
A src/common/REST/ProjectAuthorization.class.php +42 −0 Go to diff View file
M src/common/REST/TokenAuthentication.class.php +1 −37 Go to diff View file
M src/common/autoload.php +4 −2 Go to diff View file
M src/common/include/Combined.class.php +1 −0 Go to diff View file
M src/common/project/REST/v1/ProjectResource.class.php +5 −13 Go to diff View file
M src/www/api/index.php +11 −8 Go to diff View file
R plugins/boomerang/www/js/d3.min.js Go to diff View file
M tests/lib/rest/TestDataBuilder.php +15 −3 Go to diff View file
A tests/rest/MilestoneBurndownTest.php +54 −0 Go to diff View file
M tests/rest/MilestoneTest.php +1 −1 Go to diff View file
A tests/simpletest/common/REST/GateKeeperTestPHP53.php +119 −0 Go to diff View file
M tools/rpm/Makefile +2 −0 Go to diff View file
M tools/rpm/tuleap.rhel6.spec +12 −0 Go to diff View file
M tools/rpm/tuleap.spec +12 −0 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/README.md +0 −18 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/attributes/default.rb +0 −15 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/definitions/createrepo.rb +0 −27 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/definitions/disable_yum_repository.rb +0 −6 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/definitions/epel_package.rb +0 −3 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/definitions/remote_rpm.rb +0 −12 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/definitions/tuleap_yum_repository.rb +0 −13 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/definitions/yum_clean.rb +0 −4 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/files/default/selinux +0 −10 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/metadata.rb +0 −6 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/recipes/base.rb +0 −28 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/recipes/build.rb +0 −74 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/recipes/external_dependencies.rb +0 −33 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/recipes/git_deployment.rb +0 −47 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/recipes/iptables.rb +0 −26 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/recipes/local_repos.rb +0 −38 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/recipes/packaging_tools.rb +0 −66 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/recipes/php.rb +0 −39 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/recipes/rpm_deployment.rb +0 −71 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/recipes/selinux.rb +0 −27 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/recipes/yum.rb +0 −38 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/tuleap/templates/default/CentOS-Base.repo.erb +0 −102 Go to diff View file
D tools/vagrant/chef-solo/cookbooks/yum +0 −1 Go to diff View file
D tools/vagrant/chef-solo/data_bags/.gitkeep +0 −0 Go to diff View file
D tools/vagrant/chef-solo/roles/.gitkeep +0 −0 Go to diff View file
D tools/vagrant/chef-solo/roles/tuleap.rb +0 −5 Go to diff View file
D tools/vagrant/chef-solo/roles/tuleap_development.rb +0 −5 Go to diff View file
D tools/vagrant/chef-solo/roles/tuleap_packaging.rb +0 −8 Go to diff View file