Skip to content
This repository was archived by the owner on May 13, 2024. It is now read-only.

Commit 24ec3b5

Browse files
author
Ilya Nikolaevskiy
committed
Merge branch 'video-timing-extension' of github.com:webrtc/webrtc-org into video-timing-extension
2 parents b6b616e + 2000e58 commit 24ec3b5

File tree

21 files changed

+442
-215
lines changed

21 files changed

+442
-215
lines changed

.travis.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,15 @@ env:
88
- CLOUDSDK_CORE_DISABLE_PROMPTS=1
99
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speed up html-proofer install
1010

11+
# Run the install script, but suppress tar output since excessive output
12+
# makes Travis choke.
13+
before_install:
14+
- if [ ! -d ${HOME}/google-cloud-sdk ]; then
15+
curl https://sdk.cloud.google.com | bash | grep -v google-cloud-sdk;
16+
fi
17+
1118
cache:
1219
bundler: true
13-
directories:
14-
- "$HOME/google-cloud-sdk/"
1520

1621
# See the following for more details:
1722
# https://docs.travis-ci.com/user/customizing-the-build/#Building-Specific-Branches
@@ -22,6 +27,6 @@ branches:
2227

2328
script:
2429
- bundle exec jekyll build --config _config.yml,_config_prod.yml
25-
#- gem install html-proofer
26-
#- htmlproofer ./_site --only-4xx --allow-hash-href --alt-ignore '/.*/'
30+
- gem install html-proofer
31+
- htmlproofer ./_site --only-4xx --allow-hash-href --alt-ignore '/.*/'
2732
- _scripts/travis-deploy.sh

Gemfile.lock

Lines changed: 178 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,128 +1,219 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
RedCloth (4.2.9)
5-
activesupport (4.2.5.1)
4+
activesupport (4.2.9)
65
i18n (~> 0.7)
7-
json (~> 1.7, >= 1.7.7)
86
minitest (~> 5.1)
97
thread_safe (~> 0.3, >= 0.3.4)
108
tzinfo (~> 1.1)
11-
addressable (2.3.8)
9+
addressable (2.5.2)
10+
public_suffix (>= 2.0.2, < 4.0)
1211
coffee-script (2.4.1)
1312
coffee-script-source
1413
execjs
15-
coffee-script-source (1.10.0)
16-
colorator (0.1)
17-
ethon (0.8.1)
14+
coffee-script-source (1.11.1)
15+
colorator (1.1.0)
16+
concurrent-ruby (1.0.5)
17+
ethon (0.11.0)
1818
ffi (>= 1.3.0)
19-
execjs (2.6.0)
20-
faraday (0.9.2)
19+
execjs (2.7.0)
20+
faraday (0.13.1)
2121
multipart-post (>= 1.2, < 3)
22-
ffi (1.9.10)
23-
gemoji (2.1.0)
24-
github-pages (48)
25-
RedCloth (= 4.2.9)
26-
github-pages-health-check (= 0.6.1)
27-
jekyll (= 3.0.3)
28-
jekyll-coffeescript (= 1.0.1)
29-
jekyll-feed (= 0.3.1)
30-
jekyll-gist (= 1.4.0)
31-
jekyll-mentions (= 1.0.0)
22+
ffi (1.9.18)
23+
forwardable-extended (2.6.0)
24+
gemoji (3.0.0)
25+
github-pages (169)
26+
activesupport (= 4.2.9)
27+
github-pages-health-check (= 1.3.5)
28+
jekyll (= 3.6.2)
29+
jekyll-avatar (= 0.5.0)
30+
jekyll-coffeescript (= 1.0.2)
31+
jekyll-default-layout (= 0.1.4)
32+
jekyll-feed (= 0.9.2)
33+
jekyll-gist (= 1.4.1)
34+
jekyll-github-metadata (= 2.9.3)
35+
jekyll-mentions (= 1.2.0)
36+
jekyll-optional-front-matter (= 0.2.0)
3237
jekyll-paginate (= 1.1.0)
33-
jekyll-redirect-from (= 0.9.1)
34-
jekyll-sass-converter (= 1.3.0)
35-
jekyll-seo-tag (= 1.0.0)
36-
jekyll-sitemap (= 0.10.0)
37-
jekyll-textile-converter (= 0.1.0)
38-
jemoji (= 0.5.1)
39-
kramdown (= 1.9.0)
40-
liquid (= 3.0.6)
38+
jekyll-readme-index (= 0.1.0)
39+
jekyll-redirect-from (= 0.12.1)
40+
jekyll-relative-links (= 0.5.1)
41+
jekyll-sass-converter (= 1.5.0)
42+
jekyll-seo-tag (= 2.3.0)
43+
jekyll-sitemap (= 1.1.1)
44+
jekyll-swiss (= 0.4.0)
45+
jekyll-theme-architect (= 0.1.0)
46+
jekyll-theme-cayman (= 0.1.0)
47+
jekyll-theme-dinky (= 0.1.0)
48+
jekyll-theme-hacker (= 0.1.0)
49+
jekyll-theme-leap-day (= 0.1.0)
50+
jekyll-theme-merlot (= 0.1.0)
51+
jekyll-theme-midnight (= 0.1.0)
52+
jekyll-theme-minimal (= 0.1.0)
53+
jekyll-theme-modernist (= 0.1.0)
54+
jekyll-theme-primer (= 0.5.2)
55+
jekyll-theme-slate (= 0.1.0)
56+
jekyll-theme-tactile (= 0.1.0)
57+
jekyll-theme-time-machine (= 0.1.0)
58+
jekyll-titles-from-headings (= 0.4.0)
59+
jemoji (= 0.8.1)
60+
kramdown (= 1.14.0)
61+
liquid (= 4.0.0)
62+
listen (= 3.0.6)
4163
mercenary (~> 0.3)
42-
rdiscount (= 2.1.8)
43-
redcarpet (= 3.3.3)
44-
rouge (= 1.10.1)
64+
minima (= 2.1.1)
65+
rouge (= 2.2.1)
4566
terminal-table (~> 1.4)
46-
github-pages-health-check (0.6.1)
67+
github-pages-health-check (1.3.5)
4768
addressable (~> 2.3)
4869
net-dns (~> 0.8)
49-
public_suffix (~> 1.4)
70+
octokit (~> 4.0)
71+
public_suffix (~> 2.0)
5072
typhoeus (~> 0.7)
51-
html-pipeline (2.3.0)
52-
activesupport (>= 2, < 5)
73+
html-pipeline (2.7.1)
74+
activesupport (>= 2)
5375
nokogiri (>= 1.4)
54-
i18n (0.7.0)
55-
jekyll (3.0.3)
56-
colorator (~> 0.1)
76+
i18n (0.9.1)
77+
concurrent-ruby (~> 1.0)
78+
jekyll (3.6.2)
79+
addressable (~> 2.4)
80+
colorator (~> 1.0)
5781
jekyll-sass-converter (~> 1.0)
5882
jekyll-watch (~> 1.1)
59-
kramdown (~> 1.3)
60-
liquid (~> 3.0)
83+
kramdown (~> 1.14)
84+
liquid (~> 4.0)
6185
mercenary (~> 0.3.3)
62-
rouge (~> 1.7)
86+
pathutil (~> 0.9)
87+
rouge (>= 1.7, < 3)
6388
safe_yaml (~> 1.0)
64-
jekyll-coffeescript (1.0.1)
89+
jekyll-avatar (0.5.0)
90+
jekyll (~> 3.0)
91+
jekyll-coffeescript (1.0.2)
6592
coffee-script (~> 2.2)
66-
jekyll-feed (0.3.1)
67-
jekyll-gist (1.4.0)
93+
coffee-script-source (~> 1.11.1)
94+
jekyll-default-layout (0.1.4)
95+
jekyll (~> 3.0)
96+
jekyll-feed (0.9.2)
97+
jekyll (~> 3.3)
98+
jekyll-gist (1.4.1)
6899
octokit (~> 4.2)
69-
jekyll-mentions (1.0.0)
70-
html-pipeline (~> 2.2)
100+
jekyll-github-metadata (2.9.3)
101+
jekyll (~> 3.1)
102+
octokit (~> 4.0, != 4.4.0)
103+
jekyll-mentions (1.2.0)
104+
activesupport (~> 4.0)
105+
html-pipeline (~> 2.3)
106+
jekyll (~> 3.0)
107+
jekyll-optional-front-matter (0.2.0)
71108
jekyll (~> 3.0)
72109
jekyll-paginate (1.1.0)
73-
jekyll-redirect-from (0.9.1)
74-
jekyll (>= 2.0)
75-
jekyll-sass-converter (1.3.0)
76-
sass (~> 3.2)
77-
jekyll-seo-tag (1.0.0)
78-
jekyll (>= 2.0)
79-
jekyll-sitemap (0.10.0)
80-
jekyll-textile-converter (0.1.0)
81-
RedCloth (~> 4.0)
82-
jekyll-watch (1.3.1)
83-
listen (~> 3.0)
84-
jemoji (0.5.1)
85-
gemoji (~> 2.0)
110+
jekyll-readme-index (0.1.0)
111+
jekyll (~> 3.0)
112+
jekyll-redirect-from (0.12.1)
113+
jekyll (~> 3.3)
114+
jekyll-relative-links (0.5.1)
115+
jekyll (~> 3.3)
116+
jekyll-sass-converter (1.5.0)
117+
sass (~> 3.4)
118+
jekyll-seo-tag (2.3.0)
119+
jekyll (~> 3.3)
120+
jekyll-sitemap (1.1.1)
121+
jekyll (~> 3.3)
122+
jekyll-swiss (0.4.0)
123+
jekyll-theme-architect (0.1.0)
124+
jekyll (~> 3.5)
125+
jekyll-seo-tag (~> 2.0)
126+
jekyll-theme-cayman (0.1.0)
127+
jekyll (~> 3.5)
128+
jekyll-seo-tag (~> 2.0)
129+
jekyll-theme-dinky (0.1.0)
130+
jekyll (~> 3.5)
131+
jekyll-seo-tag (~> 2.0)
132+
jekyll-theme-hacker (0.1.0)
133+
jekyll (~> 3.5)
134+
jekyll-seo-tag (~> 2.0)
135+
jekyll-theme-leap-day (0.1.0)
136+
jekyll (~> 3.5)
137+
jekyll-seo-tag (~> 2.0)
138+
jekyll-theme-merlot (0.1.0)
139+
jekyll (~> 3.5)
140+
jekyll-seo-tag (~> 2.0)
141+
jekyll-theme-midnight (0.1.0)
142+
jekyll (~> 3.5)
143+
jekyll-seo-tag (~> 2.0)
144+
jekyll-theme-minimal (0.1.0)
145+
jekyll (~> 3.5)
146+
jekyll-seo-tag (~> 2.0)
147+
jekyll-theme-modernist (0.1.0)
148+
jekyll (~> 3.5)
149+
jekyll-seo-tag (~> 2.0)
150+
jekyll-theme-primer (0.5.2)
151+
jekyll (~> 3.5)
152+
jekyll-github-metadata (~> 2.9)
153+
jekyll-seo-tag (~> 2.2)
154+
jekyll-theme-slate (0.1.0)
155+
jekyll (~> 3.5)
156+
jekyll-seo-tag (~> 2.0)
157+
jekyll-theme-tactile (0.1.0)
158+
jekyll (~> 3.5)
159+
jekyll-seo-tag (~> 2.0)
160+
jekyll-theme-time-machine (0.1.0)
161+
jekyll (~> 3.5)
162+
jekyll-seo-tag (~> 2.0)
163+
jekyll-titles-from-headings (0.4.0)
164+
jekyll (~> 3.3)
165+
jekyll-watch (1.5.0)
166+
listen (~> 3.0, < 3.1)
167+
jemoji (0.8.1)
168+
activesupport (~> 4.0, >= 4.2.9)
169+
gemoji (~> 3.0)
86170
html-pipeline (~> 2.2)
87-
jekyll (>= 2.0)
88-
json (1.8.3)
89-
kramdown (1.9.0)
90-
libv8 (3.16.14.13)
91-
liquid (3.0.6)
171+
jekyll (>= 3.0)
172+
kramdown (1.14.0)
173+
libv8 (3.16.14.19)
174+
liquid (4.0.0)
92175
listen (3.0.6)
93176
rb-fsevent (>= 0.9.3)
94177
rb-inotify (>= 0.9.7)
95-
mercenary (0.3.5)
96-
mini_portile2 (2.0.0)
97-
minitest (5.8.4)
178+
mercenary (0.3.6)
179+
mini_portile2 (2.3.0)
180+
minima (2.1.1)
181+
jekyll (~> 3.3)
182+
minitest (5.10.3)
98183
multipart-post (2.0.0)
99184
net-dns (0.8.0)
100-
nokogiri (1.6.7.2)
101-
mini_portile2 (~> 2.0.0.rc2)
102-
octokit (4.2.0)
103-
sawyer (~> 0.6.0, >= 0.5.3)
104-
public_suffix (1.5.3)
105-
rb-fsevent (0.9.7)
106-
rb-inotify (0.9.7)
107-
ffi (>= 0.5.0)
108-
rdiscount (2.1.8)
109-
redcarpet (3.3.3)
185+
nokogiri (1.8.1)
186+
mini_portile2 (~> 2.3.0)
187+
octokit (4.7.0)
188+
sawyer (~> 0.8.0, >= 0.5.3)
189+
pathutil (0.16.0)
190+
forwardable-extended (~> 2.6)
191+
public_suffix (2.0.5)
192+
rb-fsevent (0.10.2)
193+
rb-inotify (0.9.10)
194+
ffi (>= 0.5.0, < 2)
110195
ref (2.0.0)
111-
rouge (1.10.1)
196+
rouge (2.2.1)
112197
safe_yaml (1.0.4)
113-
sass (3.4.21)
114-
sawyer (0.6.0)
115-
addressable (~> 2.3.5)
116-
faraday (~> 0.8, < 0.10)
117-
terminal-table (1.5.2)
118-
therubyracer (0.12.2)
119-
libv8 (~> 3.16.14.0)
198+
sass (3.5.3)
199+
sass-listen (~> 4.0.0)
200+
sass-listen (4.0.0)
201+
rb-fsevent (~> 0.9, >= 0.9.4)
202+
rb-inotify (~> 0.9, >= 0.9.7)
203+
sawyer (0.8.1)
204+
addressable (>= 2.3.5, < 2.6)
205+
faraday (~> 0.8, < 1.0)
206+
terminal-table (1.8.0)
207+
unicode-display_width (~> 1.1, >= 1.1.1)
208+
therubyracer (0.12.3)
209+
libv8 (~> 3.16.14.15)
120210
ref
121-
thread_safe (0.3.5)
211+
thread_safe (0.3.6)
122212
typhoeus (0.8.0)
123213
ethon (>= 0.8.0)
124-
tzinfo (1.2.2)
214+
tzinfo (1.2.4)
125215
thread_safe (~> 0.1)
216+
unicode-display_width (1.3.0)
126217

127218
PLATFORMS
128219
ruby
@@ -132,4 +223,4 @@ DEPENDENCIES
132223
therubyracer
133224

134225
BUNDLED WITH
135-
1.11.2
226+
1.16.0

_includes/topnav.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Developer <span class="caret"></span></a>
3737
<ul class="dropdown-menu" role="menu">
3838
<li><a href="{{ site.baseurl }}/start/">Getting started</a></li>
39+
<li><a href="{{ site.baseurl }}/code-of-conduct/">Code of conduct</a></li>
3940
<li><a href="{{ site.baseurl }}/contributing/">Contributing</a></li>
4041
<li><a href="{{ site.baseurl }}/bugs/">Reporting Bugs</a></li>
4142
<li><a href="{{ site.baseurl }}/troubleshooting/">Troubleshooting</a></li>

_posts/2012-03-05-source-code-to-apprtc.appspot.com-example-app-available.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ date: 2012-03-05 14:21:00
77

88

99
The source code to <https://apprtc.appspot.com/> is now available at
10-
<https://chromium.googlesource.com/external/webrtc/+/master/webrtc/examples/androidapp/src/org/appspot/apprtc>.
10+
<https://webrtc.googlesource.com/src/+/master/examples/androidapp/src/org/appspot/apprtc>.
1111

1212
Our goal is to keep this app updated to work with the latest Chrome code and
1313
to keep the code simple enough for everyone to use as an example or to simply

0 commit comments

Comments
 (0)