stable

Forked from tuleap/stable

Clone or download

Read-only

Merge commit 'refs/changes/20/320/2' of ssh://gerrit.tuleap.net:29418/tuleap into tuleap-stable-master

* ssh://gerrit.tuleap.net:29418/tuleap: story #2524 - see colour type at a glance on cardwall Fix fatal error when parent does not have a planning Conflicts: plugins/tracker/tests/Tracker_ArtifactTest.php

Modified Files

Name
M plugins/agiledashboard/include/Planning/ItemCardPresenterCallback.class.php +2 −1 Go to diff View file
M plugins/agiledashboard/include/Planning/ItemPresenter.class.php +16 −3 Go to diff View file
M plugins/agiledashboard/include/Planning/MilestoneFactory.class.php +5 −0 Go to diff View file
M plugins/agiledashboard/tests/planning/ItemPresenterTest.php +1 −1 Go to diff View file
M plugins/agiledashboard/tests/planning/MilestoneFactoryTest.php +18 −0 Go to diff View file
M plugins/cardwall/include/CardPresenter.class.php +12 −1 Go to diff View file
M plugins/cardwall/include/CreateCardPresenterCallback.class.php +2 −1 Go to diff View file
M plugins/tracker/include/Tracker/Artifact/Tracker_Artifact.class.php +17 −0 Go to diff View file
M plugins/tracker/include/Tracker/CardPresenter.class.php +9 −0 Go to diff View file
M plugins/tracker/include/Tracker/FormElement/Tracker_FormElementFactory.class.php +17 −0 Go to diff View file
M plugins/tracker/include/Tracker/FormElement/Tracker_FormElement_Field_Selectbox.class.php +33 −0 Go to diff View file
M plugins/tracker/include/Tracker/Tracker.class.php +1 −0 Go to diff View file
M plugins/tracker/templates/card.mustache +1 −1 Go to diff View file
M plugins/tracker/tests/Tracker_ArtifactTest.php +22 −0 Go to diff View file
A plugins/tracker/tests/Tracker_FormElement_Field_SelectboxTest.php +86 −0 Go to diff View file
M plugins/tracker/www/themes/default/css/style.css +1 −1 Go to diff View file