Merge branch 'livelist-rails'

pklingem · Dec 25, 2011 · daeb4a8 · daeb4a8
2 parents 5d36ca1 + 623e576
commit daeb4a8
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 732 deletions.
diff --git a/Gemfile b/Gemfile
@@ -20,6 +20,7 @@ group :assets do
 end
 
 gem 'jquery-rails'
+gem 'livelist-rails', '0.0.2'
 
 # To use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.0.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -54,6 +54,7 @@ GEM
     json (1.6.3)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
+    livelist-rails (0.0.2)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -132,6 +133,7 @@ DEPENDENCIES
   coffee-rails (~> 3.1.1)
   faker
   jquery-rails
+  livelist-rails (= 0.0.2)
   mysql2
   rabl
   rails (= 3.1.1)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -6,4 +6,5 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require livelist-rails
 //= require_tree .
diff --git a/app/assets/javascripts/livelist.coffee b/app/assets/javascripts/livelist.coffee