diff options
| author | MaZderMind | 2017-11-26 19:59:18 +0100 |
|---|---|---|
| committer | MaZderMind | 2017-11-26 19:59:18 +0100 |
| commit | 65397e5734b1439df4d68be40ffe994f26e551ec (patch) | |
| tree | 7f9f8bfe75026d9a9d140bd8c7fe0e5fa601f573 /view | |
| parent | 683e13efea2e98efca644b6d6e4c8eca58351cf0 (diff) | |
| parent | 7e9343522bd4208d9f14cea2af3f6b7873ab84e3 (diff) | |
Merge remote-tracking branch 'origin/feature/api-v2+'
Diffstat (limited to '')
| -rw-r--r-- | view/streams-json-v2.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/view/streams-json-v2.php b/view/streams-json-v2.php index bc22868..114e73e 100644 --- a/view/streams-json-v2.php +++ b/view/streams-json-v2.php @@ -90,6 +90,7 @@ foreach (Conferences::getActiveConferences() as $conference) 'thumb' => forceslash(baseurl()).$room->getThumb(), 'link' => forceslash(baseurl()).$room->getLink(), 'display' => $room->getDisplay(), + 'stream' => $room->getStream(), 'streams' => $streams, ); } @@ -105,6 +106,7 @@ foreach (Conferences::getActiveConferences() as $conference) 'author' => $conference->getAuthor(), 'description' => $conference->getDescription(), 'keywords' => $conference->getKeywords(), + 'schedule' => $conference->getSchedule()->getScheduleUrl(), 'startsAt' => $conference->startsAt() ? $conference->startsAt()->format(DateTime::ISO8601) : null, 'endsAt' => $conference->endsAt() ? $conference->endsAt()->format(DateTime::ISO8601) : null, 'groups' => $groupstruct, |