Skip to content

Commit ad9ddca

Browse files
author
Dave Newman
committed
Merge branch 'live-streaming'
2 parents 3030c32 + 1d11f05 commit ad9ddca

Some content is hidden

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

50 files changed

+1395
-272
lines changed

‎Gemfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ gem 'excon'
1414
gem 'friendly_id'
1515
gem 'green_monkey'
1616
gem 'haml-rails'
17+
gem 'icalendar'
18+
gem 'jbuilder'
1719
gem 'jquery-rails'
1820
gem 'kaminari'
1921
gem 'lograge'
@@ -23,6 +25,7 @@ gem 'pg', '~> 0.15'
2325
gem 'postmark-rails'
2426
gem 'puma_worker_killer'
2527
gem 'puma'
28+
gem 'pusher'
2629
gem 'quiet_assets'
2730
gem 'rack-cors'
2831
gem 'rack-timeout'
@@ -57,8 +60,8 @@ group :test do
5760
end
5861

5962
group :development do
60-
gem 'web-console', '~> 2.0'
6163
gem 'spring'
64+
gem 'web-console', '~> 2.0'
6265
end
6366

6467
group :production do

‎Gemfile.lock

Lines changed: 56 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.2.5.1)
5-
actionpack (= 4.2.5.1)
6-
actionview (= 4.2.5.1)
7-
activejob (= 4.2.5.1)
4+
actionmailer (4.2.6)
5+
actionpack (= 4.2.6)
6+
actionview (= 4.2.6)
7+
activejob (= 4.2.6)
88
mail (~> 2.5, >= 2.5.4)
99
rails-dom-testing (~> 1.0, >= 1.0.5)
10-
actionpack (4.2.5.1)
11-
actionview (= 4.2.5.1)
12-
activesupport (= 4.2.5.1)
10+
actionpack (4.2.6)
11+
actionview (= 4.2.6)
12+
activesupport (= 4.2.6)
1313
rack (~> 1.6)
1414
rack-test (~> 0.6.2)
1515
rails-dom-testing (~> 1.0, >= 1.0.5)
1616
rails-html-sanitizer (~> 1.0, >= 1.0.2)
17-
actionview (4.2.5.1)
18-
activesupport (= 4.2.5.1)
17+
actionview (4.2.6)
18+
activesupport (= 4.2.6)
1919
builder (~> 3.1)
2020
erubis (~> 2.7.0)
2121
rails-dom-testing (~> 1.0, >= 1.0.5)
2222
rails-html-sanitizer (~> 1.0, >= 1.0.2)
2323
active_model_serializers (0.9.4)
2424
activemodel (>= 3.2)
25-
activejob (4.2.5.1)
26-
activesupport (= 4.2.5.1)
25+
activejob (4.2.6)
26+
activesupport (= 4.2.6)
2727
globalid (>= 0.3.0)
28-
activemodel (4.2.5.1)
29-
activesupport (= 4.2.5.1)
28+
activemodel (4.2.6)
29+
activesupport (= 4.2.6)
3030
builder (~> 3.1)
31-
activerecord (4.2.5.1)
32-
activemodel (= 4.2.5.1)
33-
activesupport (= 4.2.5.1)
31+
activerecord (4.2.6)
32+
activemodel (= 4.2.6)
33+
activesupport (= 4.2.6)
3434
arel (~> 6.0)
35-
activesupport (4.2.5.1)
35+
activesupport (4.2.6)
3636
i18n (~> 0.7)
3737
json (~> 1.7, >= 1.7.7)
3838
minitest (~> 5.1)
@@ -46,7 +46,7 @@ GEM
4646
jmespath (~> 1.0)
4747
aws-sdk-resources (2.2.18)
4848
aws-sdk-core (= 2.2.18)
49-
babel-source (5.8.26)
49+
babel-source (5.8.35)
5050
babel-transpiler (0.7.0)
5151
babel-source (>= 4.0, < 6)
5252
execjs (~> 2.0)
@@ -88,7 +88,7 @@ GEM
8888
coffee-script-source
8989
execjs
9090
coffee-script-source (1.10.0)
91-
concurrent-ruby (1.0.0)
91+
concurrent-ruby (1.0.2)
9292
connection_pool (2.2.0)
9393
dalli (2.7.6)
9494
debug_inspector (0.0.2)
@@ -102,7 +102,7 @@ GEM
102102
activemodel
103103
erubis (2.7.0)
104104
excon (0.48.0)
105-
execjs (2.6.0)
105+
execjs (2.7.0)
106106
fabrication (2.14.0)
107107
fabrication-rails (0.0.1)
108108
fabrication
@@ -135,7 +135,12 @@ GEM
135135
ruby_parser (~> 3.5)
136136
http-cookie (1.0.2)
137137
domain_name (~> 0.5)
138+
httpclient (2.8.0)
138139
i18n (0.7.0)
140+
icalendar (2.3.0)
141+
jbuilder (2.4.1)
142+
activesupport (>= 3.0.0, < 5.1)
143+
multi_json (~> 1.2)
139144
jmespath (1.1.3)
140145
jquery-rails (4.1.0)
141146
rails-dom-testing (~> 1.0)
@@ -155,16 +160,17 @@ GEM
155160
railties (>= 3)
156161
loofah (2.0.3)
157162
nokogiri (>= 1.5.9)
158-
mail (2.6.3)
159-
mime-types (>= 1.16, < 3)
163+
mail (2.6.4)
164+
mime-types (>= 1.16, < 4)
160165
meta-tags (2.1.0)
161166
actionpack (>= 3.0.0)
162167
mida_vocabulary (0.2.2)
163168
blankslate (~> 3.1)
164-
mime-types (2.99)
169+
mime-types (2.99.2)
165170
mini_magick (4.4.0)
166171
mini_portile2 (2.0.0)
167-
minitest (5.8.4)
172+
minitest (5.9.0)
173+
multi_json (1.12.1)
168174
multipart-post (2.0.0)
169175
netrc (0.11.0)
170176
nokogiri (1.6.7.2)
@@ -181,23 +187,28 @@ GEM
181187
puma_worker_killer (0.0.4)
182188
get_process_mem (~> 0.2)
183189
puma (~> 2.7)
190+
pusher (1.1.0)
191+
httpclient (~> 2.7)
192+
multi_json (~> 1.0)
193+
pusher-signature (~> 0.1.8)
194+
pusher-signature (0.1.8)
184195
quiet_assets (1.1.0)
185196
railties (>= 3.1, < 5.0)
186197
rack (1.6.4)
187198
rack-cors (0.4.0)
188199
rack-test (0.6.3)
189200
rack (>= 1.0)
190201
rack-timeout (0.3.2)
191-
rails (4.2.5.1)
192-
actionmailer (= 4.2.5.1)
193-
actionpack (= 4.2.5.1)
194-
actionview (= 4.2.5.1)
195-
activejob (= 4.2.5.1)
196-
activemodel (= 4.2.5.1)
197-
activerecord (= 4.2.5.1)
198-
activesupport (= 4.2.5.1)
202+
rails (4.2.6)
203+
actionmailer (= 4.2.6)
204+
actionpack (= 4.2.6)
205+
actionview (= 4.2.6)
206+
activejob (= 4.2.6)
207+
activemodel (= 4.2.6)
208+
activerecord (= 4.2.6)
209+
activesupport (= 4.2.6)
199210
bundler (>= 1.3.0, < 2.0)
200-
railties (= 4.2.5.1)
211+
railties (= 4.2.6)
201212
sprockets-rails
202213
rails-deprecated_sanitizer (1.0.3)
203214
activesupport (>= 4.2.0.alpha)
@@ -211,14 +222,14 @@ GEM
211222
rails_serve_static_assets
212223
rails_stdout_logging
213224
rails_serve_static_assets (0.0.4)
214-
rails_stdout_logging (0.0.4)
215-
railties (4.2.5.1)
216-
actionpack (= 4.2.5.1)
217-
activesupport (= 4.2.5.1)
225+
rails_stdout_logging (0.0.5)
226+
railties (4.2.6)
227+
actionpack (= 4.2.6)
228+
activesupport (= 4.2.6)
218229
rake (>= 0.8.7)
219230
thor (>= 0.18.1, < 2.0)
220-
rake (10.5.0)
221-
react-rails (1.3.1)
231+
rake (11.1.2)
232+
react-rails (1.7.1)
222233
babel-transpiler (>= 0.7.0)
223234
coffee-script-source (~> 1.8)
224235
connection_pool
@@ -251,18 +262,18 @@ GEM
251262
shoulda-matchers (2.8.0)
252263
activesupport (>= 3.0.0)
253264
spring (1.6.2)
254-
sprockets (3.5.2)
265+
sprockets (3.6.0)
255266
concurrent-ruby (~> 1.0)
256267
rack (> 1, < 3)
257-
sprockets-rails (3.0.1)
268+
sprockets-rails (3.0.4)
258269
actionpack (>= 4.0)
259270
activesupport (>= 4.0)
260271
sprockets (>= 3.0.0)
261272
stripe (1.41.0)
262273
rest-client (~> 1.4)
263274
thor (0.19.1)
264275
thread_safe (0.3.5)
265-
tilt (2.0.2)
276+
tilt (2.0.4)
266277
turbolinks (2.5.3)
267278
coffee-rails
268279
tzinfo (1.2.2)
@@ -304,6 +315,8 @@ DEPENDENCIES
304315
friendly_id
305316
green_monkey
306317
haml-rails
318+
icalendar
319+
jbuilder
307320
jquery-rails
308321
kaminari
309322
letter_opener
@@ -314,6 +327,7 @@ DEPENDENCIES
314327
postmark-rails
315328
puma
316329
puma_worker_killer
330+
pusher
317331
quiet_assets
318332
rack-cors
319333
rack-timeout

‎app/assets/images/conference-room.png

142 KB
Loading

‎app/assets/images/happy-cat.jpg

51.1 KB
Loading

‎app/assets/images/live-banner.jpg

65.7 KB
Loading

‎app/assets/images/live-banner.png

449 KB
Loading

‎app/assets/images/offline-holder.png

9.24 KB
Loading

‎app/assets/javascripts/application.js.coffee

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#
1010
# Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
1111
# about supported directives.
12-
#
1312
#= require jquery
1413
#= require jquery_ujs
1514
#= require turbolinks

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy