Permalink
Browse files

Merge pull request #2 from rbeiter/patch/update_to_2014

Update for 2014
  • Loading branch information...
2 parents bdd350d + 8dc3144 commit addd58f4bd8521a10c309aa6686641d905aceb2c @jonathanpenn committed Jan 2, 2014
Showing with 70 additions and 74 deletions.
  1. +1 −0 .rbenv-gemset
  2. +1 −1 .rbenv-version
  3. +3 −1 Gemfile
  4. +58 −66 Gemfile.lock
  5. +5 −4 app/assets/javascripts/models/constants.js
  6. +2 −2 app/views/home/index.html.erb
View
@@ -0,0 +1 @@
+icodemash
View
@@ -1 +1 @@
-1.9.3-p194
+1.9.3-p448
View
@@ -1,6 +1,8 @@
+ruby '1.9.3'
+
source 'http://rubygems.org'
-gem 'rails'
+gem 'rails', '~> 3.1.0'
# Gems used only for assets and not required
# in production environments by default.
View
@@ -1,119 +1,111 @@
GEM
remote: http://rubygems.org/
specs:
- POpen4 (0.1.4)
- Platform (>= 0.4.0)
- open4
- Platform (0.4.0)
- actionmailer (3.1.1)
- actionpack (= 3.1.1)
- mail (~> 2.3.0)
- actionpack (3.1.1)
- activemodel (= 3.1.1)
- activesupport (= 3.1.1)
+ actionmailer (3.1.12)
+ actionpack (= 3.1.12)
+ mail (~> 2.4.4)
+ actionpack (3.1.12)
+ activemodel (= 3.1.12)
+ activesupport (= 3.1.12)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
- rack (~> 1.3.2)
- rack-cache (~> 1.1)
+ rack (~> 1.3.6)
+ rack-cache (~> 1.2)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.2)
- activemodel (3.1.1)
- activesupport (= 3.1.1)
+ sprockets (~> 2.0.4)
+ activemodel (3.1.12)
+ activesupport (= 3.1.12)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.1)
- activemodel (= 3.1.1)
- activesupport (= 3.1.1)
- arel (~> 2.2.1)
+ activerecord (3.1.12)
+ activemodel (= 3.1.12)
+ activesupport (= 3.1.12)
+ arel (~> 2.2.3)
tzinfo (~> 0.3.29)
- activeresource (3.1.1)
- activemodel (= 3.1.1)
- activesupport (= 3.1.1)
- activesupport (3.1.1)
+ activeresource (3.1.12)
+ activemodel (= 3.1.12)
+ activesupport (= 3.1.12)
+ activesupport (3.1.12)
multi_json (~> 1.0)
- arel (2.2.1)
- builder (3.0.0)
+ arel (2.2.3)
+ builder (3.0.4)
coffee-rails (3.1.1)
coffee-script (>= 2.2.0)
railties (~> 3.1.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.2)
+ coffee-script-source (1.6.3)
erubis (2.7.0)
- execjs (1.2.9)
- multi_json (~> 1.0)
- haml (3.1.3)
- hike (1.2.1)
- i18n (0.6.0)
- json (1.6.1)
- mail (2.3.0)
+ execjs (2.0.2)
+ haml (4.0.4)
+ tilt
+ hike (1.2.3)
+ i18n (0.6.9)
+ json (1.8.1)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.16)
- multi_json (1.0.3)
- open4 (1.2.0)
- polyglot (0.3.2)
- rack (1.3.5)
- rack-cache (1.1)
+ mime-types (1.25.1)
+ multi_json (1.8.2)
+ polyglot (0.3.3)
+ rack (1.3.10)
+ rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
- rack-ssl (1.3.2)
+ rack-ssl (1.3.3)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rails (3.1.1)
- actionmailer (= 3.1.1)
- actionpack (= 3.1.1)
- activerecord (= 3.1.1)
- activeresource (= 3.1.1)
- activesupport (= 3.1.1)
+ rails (3.1.12)
+ actionmailer (= 3.1.12)
+ actionpack (= 3.1.12)
+ activerecord (= 3.1.12)
+ activeresource (= 3.1.12)
+ activesupport (= 3.1.12)
bundler (~> 1.0)
- railties (= 3.1.1)
- railties (3.1.1)
- actionpack (= 3.1.1)
- activesupport (= 3.1.1)
+ railties (= 3.1.12)
+ railties (3.1.12)
+ actionpack (= 3.1.12)
+ activesupport (= 3.1.12)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
- rake (0.9.2.2)
- rdoc (3.11)
+ rake (10.1.1)
+ rdoc (3.12.2)
json (~> 1.4)
- sass (3.1.10)
- sass-rails (3.1.4)
+ sass (3.2.13)
+ sass-rails (3.1.0)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
sass (>= 3.1.4)
- sprockets (~> 2.0.0)
- tilt (~> 1.3.2)
- sprockets (2.0.3)
+ sprockets (2.0.4)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
thor (0.14.6)
- tilt (1.3.3)
- treetop (1.4.10)
+ tilt (1.4.1)
+ treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.30)
- uglifier (1.0.4)
+ tzinfo (0.3.38)
+ uglifier (2.4.0)
execjs (>= 0.3.0)
- multi_json (>= 1.0.2)
- yui-compressor (0.9.6)
- POpen4 (>= 0.1.4)
+ json (>= 1.8.0)
+ yui-compressor (0.12.0)
PLATFORMS
ruby
DEPENDENCIES
coffee-rails
haml
- rails
+ rails (~> 3.1.0)
sass-rails
uglifier
yui-compressor
@@ -1,6 +1,7 @@
+Conference_Start = Date.parse("2014-01-07T05:00:00Z")
+Day = 86400 * 1000
Constants = {
- wednesdayStart: new Date(1357707600000),
- thursdayStart: new Date(1357794000000),
- fridayStart: new Date(1357880400000)
+ wednesdayStart: Conference_Start + Day,
+ thursdayStart: Conference_Start + 2 * Day,
+ fridayStart: Conference_Start + 3 * Day
}
-
@@ -5,7 +5,7 @@
<div data-role='page' id='home_page' data-add-back-btn='false'>
<div data-role='header'>
- <h1>CodeMash 2013</h1>
+ <h1>CodeMash 2014</h1>
<%= image_tag('ajax-loader.gif', class: 'sync-status') %>
</div><!-- /header -->
@@ -91,7 +91,7 @@
<div data-role='content'>
- <p>iCodeMash 2013 is a slick and simple HTML5 web app that caches itself offline, automatically updates, and periodically polls the CodeMash JSON api for session information. It is served up by Rails 3.1 running on Heroku.</p>
+ <p>iCodeMash 2014 is a slick and simple HTML5 web app that caches itself offline, automatically updates, and periodically polls the CodeMash JSON api for session information. It is served up by Rails 3.1 running on Heroku.</p>
<p>Use the full text search or browse the schedule and mark the ones you think you'll attend as "favorites". Tap on a session's room name when viewing its details to see a map of the convention center with a blue dot on the room. Comments or questions? <a href="http://twitter.com/jonathanpenn">Let me know</a>!</p>

0 comments on commit addd58f

Please sign in to comment.