Skip to content

Commit 71ec3c4

Browse files
aoberoiaoberoi
committed
Merge branch 'aoberoi-issue-61'
2 parents 1fe11f3 + 62f3597 commit 71ec3c4

File tree

54 files changed

+366
-282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+366
-282
lines changed

‎docs/classes/OpenTok.Archive.html‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,28 +144,28 @@
144144
<div class="accordion" style="margin-bottom: 0">
145145
<div class="accordion-group">
146146
<div class="accordion-heading">
147-
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-720410790"></a>
147+
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1739838233"></a>
148148
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
149149
</div>
150-
<div id="namespace-720410790" class="accordion-body collapse in">
150+
<div id="namespace-1739838233" class="accordion-body collapse in">
151151
<div class="accordion-inner">
152152

153153
<div class="accordion" style="margin-bottom: 0">
154154
<div class="accordion-group">
155155
<div class="accordion-heading">
156-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1772829201"></a>
156+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-467551304"></a>
157157
<a href="../namespaces/OpenTok.html" style="margin-left: 30px; padding-left: 0">OpenTok</a>
158158
</div>
159-
<div id="namespace-1772829201" class="accordion-body collapse ">
159+
<div id="namespace-467551304" class="accordion-body collapse ">
160160
<div class="accordion-inner">
161161

162162
<div class="accordion" style="margin-bottom: 0">
163163
<div class="accordion-group">
164164
<div class="accordion-heading">
165-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1510364022"></a>
165+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-925041433"></a>
166166
<a href="../namespaces/OpenTok.Exception.html" style="margin-left: 30px; padding-left: 0">Exception</a>
167167
</div>
168-
<div id="namespace-1510364022" class="accordion-body collapse ">
168+
<div id="namespace-925041433" class="accordion-body collapse ">
169169
<div class="accordion-inner">
170170

171171

@@ -526,11 +526,14 @@ <h3 class="public ">$status</h3>
526526
<p>The status of the archive, which can be one of the following:</p>
527527
<ul>
528528
<li> "available" -- The archive is available for download from the OpenTok cloud.</li>
529+
<li>"expired" -- The archive is no longer available for download from the OpenTok
530+
cloud.</li>
529531
<li> "failed" -- The archive recording failed.</li>
530532
<li> "started" -- The archive started and is in the process of being recorded.</li>
531533
<li> "stopped" -- The archive stopped recording.</li>
532534
<li> "uploaded" -- The archive is available for download from the the upload target
533-
S3 bucket.</li>
535+
Amazon S3 bucket or Windows Azure container you specified at
536+
<a href="https://dashboard.tokbox.com">the OpenTok dashboard</a>.</li>
534537
</ul>
535538

536539
<h4>Type</h4>
@@ -742,7 +745,7 @@ <h1><i class="icon-pushpin"></i></h1>
742745
<section class="span10 offset1">
743746
<hr />
744747
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
745-
on June 16th, 2014 at 23:01.
748+
on June 19th, 2014 at 22:14.
746749
</section>
747750
</section>
748751
</section>

‎docs/classes/OpenTok.ArchiveList.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,28 +144,28 @@
144144
<div class="accordion" style="margin-bottom: 0">
145145
<div class="accordion-group">
146146
<div class="accordion-heading">
147-
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1188009187"></a>
147+
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-160652886"></a>
148148
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
149149
</div>
150-
<div id="namespace-1188009187" class="accordion-body collapse in">
150+
<div id="namespace-160652886" class="accordion-body collapse in">
151151
<div class="accordion-inner">
152152

153153
<div class="accordion" style="margin-bottom: 0">
154154
<div class="accordion-group">
155155
<div class="accordion-heading">
156-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1888721302"></a>
156+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-127367310"></a>
157157
<a href="../namespaces/OpenTok.html" style="margin-left: 30px; padding-left: 0">OpenTok</a>
158158
</div>
159-
<div id="namespace-1888721302" class="accordion-body collapse ">
159+
<div id="namespace-127367310" class="accordion-body collapse ">
160160
<div class="accordion-inner">
161161

162162
<div class="accordion" style="margin-bottom: 0">
163163
<div class="accordion-group">
164164
<div class="accordion-heading">
165-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1041245286"></a>
165+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1576748464"></a>
166166
<a href="../namespaces/OpenTok.Exception.html" style="margin-left: 30px; padding-left: 0">Exception</a>
167167
</div>
168-
<div id="namespace-1041245286" class="accordion-body collapse ">
168+
<div id="namespace-1576748464" class="accordion-body collapse ">
169169
<div class="accordion-inner">
170170

171171

@@ -422,7 +422,7 @@ <h1><i class="icon-pushpin"></i></h1>
422422
<section class="span10 offset1">
423423
<hr />
424424
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
425-
on June 16th, 2014 at 23:01.
425+
on June 19th, 2014 at 22:14.
426426
</section>
427427
</section>
428428
</section>

‎docs/classes/OpenTok.Exception.ArchiveAuthenticationException.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,28 +144,28 @@
144144
<div class="accordion" style="margin-bottom: 0">
145145
<div class="accordion-group">
146146
<div class="accordion-heading">
147-
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1996388462"></a>
147+
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1548331235"></a>
148148
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
149149
</div>
150-
<div id="namespace-1996388462" class="accordion-body collapse in">
150+
<div id="namespace-1548331235" class="accordion-body collapse in">
151151
<div class="accordion-inner">
152152

153153
<div class="accordion" style="margin-bottom: 0">
154154
<div class="accordion-group">
155155
<div class="accordion-heading">
156-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1257714281"></a>
156+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1144689543"></a>
157157
<a href="../namespaces/OpenTok.html" style="margin-left: 30px; padding-left: 0">OpenTok</a>
158158
</div>
159-
<div id="namespace-1257714281" class="accordion-body collapse ">
159+
<div id="namespace-1144689543" class="accordion-body collapse ">
160160
<div class="accordion-inner">
161161

162162
<div class="accordion" style="margin-bottom: 0">
163163
<div class="accordion-group">
164164
<div class="accordion-heading">
165-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-282406681"></a>
165+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-607099308"></a>
166166
<a href="../namespaces/OpenTok.Exception.html" style="margin-left: 30px; padding-left: 0">Exception</a>
167167
</div>
168-
<div id="namespace-282406681" class="accordion-body collapse ">
168+
<div id="namespace-607099308" class="accordion-body collapse ">
169169
<div class="accordion-inner">
170170

171171

@@ -421,7 +421,7 @@ <h1><i class="icon-pushpin"></i></h1>
421421
<section class="span10 offset1">
422422
<hr />
423423
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
424-
on June 16th, 2014 at 23:01.
424+
on June 19th, 2014 at 22:14.
425425
</section>
426426
</section>
427427
</section>

‎docs/classes/OpenTok.Exception.ArchiveDomainException.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,28 +144,28 @@
144144
<div class="accordion" style="margin-bottom: 0">
145145
<div class="accordion-group">
146146
<div class="accordion-heading">
147-
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1684892891"></a>
147+
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-764901580"></a>
148148
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
149149
</div>
150-
<div id="namespace-1684892891" class="accordion-body collapse in">
150+
<div id="namespace-764901580" class="accordion-body collapse in">
151151
<div class="accordion-inner">
152152

153153
<div class="accordion" style="margin-bottom: 0">
154154
<div class="accordion-group">
155155
<div class="accordion-heading">
156-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-461334847"></a>
156+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-103314661"></a>
157157
<a href="../namespaces/OpenTok.html" style="margin-left: 30px; padding-left: 0">OpenTok</a>
158158
</div>
159-
<div id="namespace-461334847" class="accordion-body collapse ">
159+
<div id="namespace-103314661" class="accordion-body collapse ">
160160
<div class="accordion-inner">
161161

162162
<div class="accordion" style="margin-bottom: 0">
163163
<div class="accordion-group">
164164
<div class="accordion-heading">
165-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1108812969"></a>
165+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-201364440"></a>
166166
<a href="../namespaces/OpenTok.Exception.html" style="margin-left: 30px; padding-left: 0">Exception</a>
167167
</div>
168-
<div id="namespace-1108812969" class="accordion-body collapse ">
168+
<div id="namespace-201364440" class="accordion-body collapse ">
169169
<div class="accordion-inner">
170170

171171

@@ -360,7 +360,7 @@ <h1><i class="icon-pushpin"></i></h1>
360360
<section class="span10 offset1">
361361
<hr />
362362
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
363-
on June 16th, 2014 at 23:01.
363+
on June 19th, 2014 at 22:14.
364364
</section>
365365
</section>
366366
</section>

‎docs/classes/OpenTok.Exception.ArchiveException.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,28 +144,28 @@
144144
<div class="accordion" style="margin-bottom: 0">
145145
<div class="accordion-group">
146146
<div class="accordion-heading">
147-
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2108158648"></a>
147+
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1401220452"></a>
148148
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
149149
</div>
150-
<div id="namespace-2108158648" class="accordion-body collapse in">
150+
<div id="namespace-1401220452" class="accordion-body collapse in">
151151
<div class="accordion-inner">
152152

153153
<div class="accordion" style="margin-bottom: 0">
154154
<div class="accordion-group">
155155
<div class="accordion-heading">
156-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1957931145"></a>
156+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1123513094"></a>
157157
<a href="../namespaces/OpenTok.html" style="margin-left: 30px; padding-left: 0">OpenTok</a>
158158
</div>
159-
<div id="namespace-1957931145" class="accordion-body collapse ">
159+
<div id="namespace-1123513094" class="accordion-body collapse ">
160160
<div class="accordion-inner">
161161

162162
<div class="accordion" style="margin-bottom: 0">
163163
<div class="accordion-group">
164164
<div class="accordion-heading">
165-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1092918585"></a>
165+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-256959935"></a>
166166
<a href="../namespaces/OpenTok.Exception.html" style="margin-left: 30px; padding-left: 0">Exception</a>
167167
</div>
168-
<div id="namespace-1092918585" class="accordion-body collapse ">
168+
<div id="namespace-256959935" class="accordion-body collapse ">
169169
<div class="accordion-inner">
170170

171171

@@ -330,7 +330,7 @@ <h1><i class="icon-pushpin"></i></h1>
330330
<section class="span10 offset1">
331331
<hr />
332332
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
333-
on June 16th, 2014 at 23:01.
333+
on June 19th, 2014 at 22:14.
334334
</section>
335335
</section>
336336
</section>

‎docs/classes/OpenTok.Exception.ArchiveUnexpectedValueException.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,28 +144,28 @@
144144
<div class="accordion" style="margin-bottom: 0">
145145
<div class="accordion-group">
146146
<div class="accordion-heading">
147-
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-879409038"></a>
147+
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1781141836"></a>
148148
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
149149
</div>
150-
<div id="namespace-879409038" class="accordion-body collapse in">
150+
<div id="namespace-1781141836" class="accordion-body collapse in">
151151
<div class="accordion-inner">
152152

153153
<div class="accordion" style="margin-bottom: 0">
154154
<div class="accordion-group">
155155
<div class="accordion-heading">
156-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1257261251"></a>
156+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2105682096"></a>
157157
<a href="../namespaces/OpenTok.html" style="margin-left: 30px; padding-left: 0">OpenTok</a>
158158
</div>
159-
<div id="namespace-1257261251" class="accordion-body collapse ">
159+
<div id="namespace-2105682096" class="accordion-body collapse ">
160160
<div class="accordion-inner">
161161

162162
<div class="accordion" style="margin-bottom: 0">
163163
<div class="accordion-group">
164164
<div class="accordion-heading">
165-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-762380386"></a>
165+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1412465934"></a>
166166
<a href="../namespaces/OpenTok.Exception.html" style="margin-left: 30px; padding-left: 0">Exception</a>
167167
</div>
168-
<div id="namespace-762380386" class="accordion-body collapse ">
168+
<div id="namespace-1412465934" class="accordion-body collapse ">
169169
<div class="accordion-inner">
170170

171171

@@ -360,7 +360,7 @@ <h1><i class="icon-pushpin"></i></h1>
360360
<section class="span10 offset1">
361361
<hr />
362362
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
363-
on June 16th, 2014 at 23:01.
363+
on June 19th, 2014 at 22:14.
364364
</section>
365365
</section>
366366
</section>

0 commit comments

Comments
 (0)