stable

Clone or download

Read-only

Merge commit 'refs/changes/75/3975/11' of ssh://gerrit.tuleap.net:29418/tuleap into HEAD

* ssh://gerrit.tuleap.net:29418/tuleap: story #7684: Add route phpwiki/:pageid/versions Change-Id: I2be5084e2006fefc7ec802612a141306b2e02bb2

Modified Files

Name
M src/common/REST/ResourcesInjector.class.php +1 −1 Go to diff View file
M src/common/REST/v1/PhpWikiPageRepresentation.class.php +1 −1 Go to diff View file
M src/common/autoload.php +7 −5 Go to diff View file
M src/common/dao/WikiVersionDao.class.php +12 −0 Go to diff View file
M src/common/project/REST/v1/ProjectResource.class.php +3 −2 Go to diff View file
M src/common/wiki/REST/v1/PhpWikiPageFullRepresentation.class.php +3 −3 Go to diff View file
A src/common/wiki/REST/v1/PhpWikiPageVersionFullRepresentation.class.php +45 −0 Go to diff View file
M src/common/wiki/REST/v1/PhpWikiPageVersionRepresentation.class.php +4 −4 Go to diff View file
M src/common/wiki/REST/v1/PhpWikiResource.class.php +99 −5 Go to diff View file
M src/common/wiki/lib/WikiPageVersion.class.php +6 −0 Go to diff View file
A src/common/wiki/lib/WikiPageVersionContentFormatter.php +65 −0 Go to diff View file
M src/common/wiki/lib/WikiPageWrapper.class.php +4 −1 Go to diff View file
M src/common/wiki/phpwiki/codendi.php +1 −1 Go to diff View file
M src/common/wiki/phpwiki/lib/display.php +1 −1 Go to diff View file
A src/common/wiki/phpwiki/themes/Codendi-light-printer-version/templates/rest.tmpl +1 −0 Go to diff View file
A src/common/wiki/phpwiki/themes/Codendi-lite/templates/rest.tmpl +1 −0 Go to diff View file
A src/common/wiki/phpwiki/themes/Codendi/templates/rest.tmpl +1 −0 Go to diff View file
A src/common/wiki/phpwiki/themes/default/templates/rest.tmpl +1 −0 Go to diff View file
M tests/rest/PhpWikiTest.php +53 −3 Go to diff View file
M tests/rest/ProjectTest.php +12 −12 Go to diff View file
A tests/rest/_fixtures/phpwiki/formatted-content-version-4.txt +14 −0 Go to diff View file
A tests/rest/_fixtures/phpwiki/wiki-content-version-4.txt +16 −0 Go to diff View file