diff --git a/lib/thirdparty/Asana.class.php b/lib/thirdparty/Asana.class.php index de0e4be0..ac12ac4c 100644 --- a/lib/thirdparty/Asana.class.php +++ b/lib/thirdparty/Asana.class.php @@ -48,7 +48,8 @@ class Asana 'body' => nl2br($fullTask['notes']), 'group' => $tagLabel, 'project_id' => $projectId, - 'assignee' => $fullTask['assignee'] ? ucwords($fullTask['assignee']['name']) : '' + 'assignee' => $fullTask['assignee'] ? ucwords($fullTask['assignee']['name']) : '', + 'quarter_date' => 'Q' . self::dateToQuarter($fullTask['due_on']) . ' ' . (string) date('Y', strtotime($fullTask['due_on'])) ]; } } @@ -89,6 +90,12 @@ class Asana $responseData = CurlWithCache::get('https://app.asana.com/api/1.0' . $endpoint, $data, $options); return $responseData['data'] ?? []; } + + // Converts date to quarter + protected static function dateToQuarter($date) + { + return $quarter = (string)ceil(date('m', strtotime($date))/3); + } } class AsanaException extends Exception diff --git a/lib/thirdparty/Github.class.php b/lib/thirdparty/Github.class.php index 7f5d5b48..61147e82 100644 --- a/lib/thirdparty/Github.class.php +++ b/lib/thirdparty/Github.class.php @@ -108,7 +108,7 @@ class Github { $twoHoursInSeconds = 7200; return CurlWithCache::get('https://api.github.com' . $endpoint . '?' . http_build_query($params), [], - ['user_agent' => 'LBRY', 'json_response' => true, 'cache' => $cache === true ? $twoHoursInSeconds : $cache]); + ['headers' => ['Accept: application/vnd.github.v3.html+json'],'user_agent' => 'LBRY', 'json_response' => true, 'cache' => $cache === true ? $twoHoursInSeconds : $cache]); } public static function listRoadmapChangesets($cache = true) @@ -163,7 +163,7 @@ class Github 'patch_version' => (int)isset($matches[3]) ? $matches[3] : 0, 'sort_key' => (int)$matches[1] * 1000000 + (int)$matches[2] * 1000 + (int)($matches[3] ?? 0), 'version' => $matches[1] . '.' . $matches[2] . '.' . (isset($matches[3]) ? $matches[3] : ''), - 'body' => ParsedownExtra::instance()->text($release['body']) + 'body' => $release['body_html'] ]; } } diff --git a/view/template/content/roadmap.php b/view/template/content/roadmap.php index d25dde76..eae32064 100644 --- a/view/template/content/roadmap.php +++ b/view/template/content/roadmap.php @@ -62,7 +62,11 @@
+ + + +
No description' ?>