diff --git a/controller/action/ContentActions.class.php b/controller/action/ContentActions.class.php index 4f66775e..143bba32 100644 --- a/controller/action/ContentActions.class.php +++ b/controller/action/ContentActions.class.php @@ -116,9 +116,13 @@ class ContentActions extends Actions public static function executeRoadmap() { - $items = array_merge(Github::listRoadmapChangesets(), Asana::listRoadmapTasks()); + $githubItems = Github::listRoadmapChangesets(); + $githubVersions = array_keys($githubItems); + + $items = array_merge($githubItems, Asana::listRoadmapTasks()); return ['content/roadmap', [ - 'closedGroups' => ['0.1', '0.2'], //should be dynamic + 'closedGroups' => array_slice($githubVersions, 0, -1), + 'latestVersion' => end($githubVersions), 'items' => $items ]]; } diff --git a/model/api/Github.class.php b/model/api/Github.class.php index 624540e8..8c2f2c33 100644 --- a/model/api/Github.class.php +++ b/model/api/Github.class.php @@ -69,6 +69,7 @@ class Github $sets[$group][] = array_intersect_key($release, ['prerelease' => null, 'tag_name' => null, 'published_at' => null]) + [ 'date' => date('Y-m-d', strtotime($release['created_at'])), //I thought published_at, but GitHub displays created_at and published_at is out of sync sometimes (0.3.2, 0.3.3) 'name' => $release['name'] ?: $release['tag_name'], + 'github_url' => $release['url'], 'major_version' => $matches[1], 'minor_version' => $matches[2], 'patch_version' => isset($matches[3]) ? $matches[3] : null, diff --git a/view/template/content/roadmap.php b/view/template/content/roadmap.php index 542506a9..f32f49dc 100644 --- a/view/template/content/roadmap.php +++ b/view/template/content/roadmap.php @@ -19,19 +19,29 @@
$groupItems): ?>