nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add vines, jsxc and devise token dependencies

Browse source
This commit is contained in:
Lukas Matt 2014-11-13 11:15:30 +01:00
parent 56e882879a
commit 78100c6fb2
2 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Gemfile
View file

@ -22,6 +22,7 @@ gem 'json', '1.8.1'
gem 'devise', '3.4.1' gem 'devise', '3.4.1'
gem 'devise_lastseenable', '0.0.4' gem 'devise_lastseenable', '0.0.4'
gem 'devise-token_authenticatable', '~> 0.3.0'
# Captcha # Captcha
@ -126,6 +127,10 @@ gem 'omniauth-twitter', '1.0.1'
gem 'twitter', '4.8.1' gem 'twitter', '4.8.1'
gem 'omniauth-wordpress','0.2.1' gem 'omniauth-wordpress','0.2.1'
# XMPP chat dependencies
gem 'diaspora-vines', '~> 0.1.25'
gem 'rails-assets-diaspora_jsxc', '~> 0.0.4'
# Tags # Tags
gem 'acts-as-taggable-on', '3.4.2' gem 'acts-as-taggable-on', '3.4.2'

31
Gemfile.lock
View file

@ -123,6 +123,8 @@ GEM
responders responders
thread_safe (~> 0.1) thread_safe (~> 0.1)
warden (~> 1.2.3) warden (~> 1.2.3)
devise-token_authenticatable (0.3.0)
devise (~> 3.4.0)
devise_lastseenable (0.0.4) devise_lastseenable (0.0.4)
devise devise
devise devise
@ -130,6 +132,13 @@ GEM
rails (>= 3.0.4) rails (>= 3.0.4)
warden warden
warden warden
diaspora-vines (0.1.25)
activerecord (~> 4.1.4)
bcrypt (~> 3.1)
em-hiredis (~> 0.3.0)
eventmachine (~> 1.0)
http_parser.rb (~> 0.6)
nokogiri (~> 1.6)
diff-lcs (1.2.5) diff-lcs (1.2.5)
eco (1.0.0) eco (1.0.0)
coffee-script coffee-script
@ -137,11 +146,15 @@ GEM
execjs execjs
eco-source (1.1.0.rc.1) eco-source (1.1.0.rc.1)
ejs (1.1.1) ejs (1.1.1)
em-hiredis (0.3.0)
eventmachine (~> 1.0)
hiredis (~> 0.5.0)
entypo-rails (2.2.2) entypo-rails (2.2.2)
railties (>= 3.1, <= 5) railties (>= 3.1, <= 5)
erubis (2.7.0) erubis (2.7.0)
ethon (0.7.1) ethon (0.7.1)
ffi (>= 1.3.0) ffi (>= 1.3.0)
eventmachine (1.0.3)
excon (0.41.0) excon (0.41.0)
execjs (2.2.2) execjs (2.2.2)
factory_girl (4.5.0) factory_girl (4.5.0)
@ -235,7 +248,9 @@ GEM
tilt tilt
hashie (3.3.1) hashie (3.3.1)
hike (1.2.3) hike (1.2.3)
hiredis (0.5.2)
http_accept_language (2.0.2) http_accept_language (2.0.2)
http_parser.rb (0.6.0)
i18n (0.6.11) i18n (0.6.11)
i18n-inflector (2.6.7) i18n-inflector (2.6.7)
i18n (>= 0.4.1) i18n (>= 0.4.1)
@ -370,13 +385,26 @@ GEM
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.7) railties (= 4.1.7)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
rails-assets-diaspora_jsxc (0.0.4)
rails-assets-jquery (~> 1.11.1)
rails-assets-jquery-colorbox (~> 1.5.14)
rails-assets-jquery-fullscreen (~> 1.1.4)
rails-assets-jquery-ui (~> 1.10.4)
rails-assets-jquery.slimscroll (~> 1.3.3)
rails-assets-jeresig--jquery.hotkeys (0.2.0) rails-assets-jeresig--jquery.hotkeys (0.2.0)
rails-assets-jquery (>= 1.4.2) rails-assets-jquery (>= 1.4.2)
rails-assets-jquery (1.11.1) rails-assets-jquery (1.11.1)
rails-assets-jquery-colorbox (1.5.14)
rails-assets-jquery (>= 1.3.2)
rails-assets-jquery-fullscreen (1.1.4)
rails-assets-jquery-idletimer (1.0.1) rails-assets-jquery-idletimer (1.0.1)
rails-assets-jquery-placeholder (2.0.8) rails-assets-jquery-placeholder (2.0.8)
rails-assets-jquery-textchange (0.2.3) rails-assets-jquery-textchange (0.2.3)
rails-assets-jquery rails-assets-jquery
rails-assets-jquery-ui (1.10.4)
rails-assets-jquery (>= 1.6)
rails-assets-jquery.slimscroll (1.3.3)
rails-assets-jquery (>= 1.7)
rails-assets-perfect-scrollbar (0.5.7) rails-assets-perfect-scrollbar (0.5.7)
rails-assets-jquery (>= 1.10) rails-assets-jquery (>= 1.10)
rails-assets-punycode (1.3.2) rails-assets-punycode (1.3.2)
@ -553,7 +581,9 @@ DEPENDENCIES
cucumber-rails (= 1.4.2) cucumber-rails (= 1.4.2)
database_cleaner (= 1.3.0) database_cleaner (= 1.3.0)
devise (= 3.4.1) devise (= 3.4.1)
devise-token_authenticatable (~> 0.3.0)
devise_lastseenable (= 0.0.4) devise_lastseenable (= 0.0.4)
diaspora-vines (~> 0.1.25)
entypo-rails (= 2.2.2) entypo-rails (= 2.2.2)
factory_girl_rails (= 4.5.0) factory_girl_rails (= 4.5.0)
faraday (= 0.9.0) faraday (= 0.9.0)
@ -600,6 +630,7 @@ DEPENDENCIES
rack-rewrite (= 1.5.0) rack-rewrite (= 1.5.0)
rack-ssl (= 1.4.1) rack-ssl (= 1.4.1)
rails (= 4.1.7) rails (= 4.1.7)
rails-assets-diaspora_jsxc (~> 0.0.4)
rails-assets-jeresig--jquery.hotkeys (= 0.2.0) rails-assets-jeresig--jquery.hotkeys (= 0.2.0)
rails-assets-jquery (= 1.11.1) rails-assets-jquery (= 1.11.1)
rails-assets-jquery-idletimer (= 1.0.1) rails-assets-jquery-idletimer (= 1.0.1)