stable

Clone or download

Read-only

Merge commit 'refs/changes/84/13284/13' of ssh://gerrit.tuleap.net:29418/tuleap into HEAD

* ssh://gerrit.tuleap.net:29418/tuleap: request #12464 Update project rest route to get time tracked trackers Change-Id: Ia14350565bc2cd28cf91cb934b409b31bc5c0941

Modified Files

Name
M plugins/timetracking/include/Timetracking/Admin/AdminDao.php +12 −0 Go to diff View file
M plugins/timetracking/include/Timetracking/REST/v1/ProjectResource.php +75 −19 Go to diff View file
A plugins/timetracking/include/Timetracking/REST/v1/TimetrackingOverviewRepresentationsBuilder.php +137 −0 Go to diff View file
M plugins/timetracking/include/Timetracking/REST/v1/TimetrackingResource.php +0 −1 Go to diff View file
M plugins/timetracking/include/Timetracking/REST/v1/UserResource.php +1 −0 Go to diff View file
M plugins/timetracking/include/timetrackingPlugin.class.php +31 −3 Go to diff View file
M plugins/timetracking/phpunit/Time/TimeRetrieverTest.php +6 −2 Go to diff View file
A plugins/timetracking/phpunit/Time/TimetrackingOverviewRepresentationsBuilderTest.php +173 −0 Go to diff View file
M plugins/timetracking/tests/rest/Timetracking/TimetrackingTest.php +33 −0 Go to diff View file
M plugins/timetracking/tests/rest/TimetrackingBase.php +3 −2 Go to diff View file
A plugins/tracker/include/REST/v1/GetTrackersQueryChecker.php +90 −0 Go to diff View file
M plugins/tracker/include/REST/v1/ProjectTrackersResource.class.php +93 −45 Go to diff View file
A plugins/tracker/phpunit/Tracker/GetTrackersQueryCheckerTest.php +105 −0 Go to diff View file
M src/common/project/REST/v1/ProjectResource.class.php +18 −9 Go to diff View file
M src/common/widget/Event/GetProjectsWithCriteria.php +1 −1 Go to diff View file
A src/common/widget/Event/GetTrackersWithCriteria.php +153 −0 Go to diff View file