diff --git a/Gemfile b/Gemfile index 985097e0696d1fc0a823ea2ea1768d48a69ae7ba..5fdae68b67bd16163f3450830e668aa38a235b17 100644 --- a/Gemfile +++ b/Gemfile @@ -148,7 +148,7 @@ gem "active_model_serializers", "0.9.3" # XMPP chat dependencies gem "diaspora-vines", "~> 0.1.28" -gem "rails-assets-diaspora_jsxc", "~> 0.1.1", source: "https://rails-assets.org" +gem "rails-assets-diaspora_jsxc", "~> 0.1.4.alpha", "< 0.1.4.develop", source: "https://rails-assets.org" # Tags diff --git a/Gemfile.lock b/Gemfile.lock index 4ac62a8c1577a5fd5648dd4d0ca29467fe1f4b84..cf043a145b6d943486a172cab4aa84e155226a96 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -515,12 +515,16 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.2.3) sprockets-rails - rails-assets-diaspora_jsxc (0.1.1) - 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-colorbox (1.6.3) + rails-assets-jquery (>= 1.3.2) + rails-assets-diaspora_jsxc (0.1.4.alpha.1) + rails-assets-colorbox (= 1.6.3) + rails-assets-favico.js (= 0.3.9) + rails-assets-jquery (= 1.11.2) + rails-assets-jquery-fullscreen-plugin (= 0.5.0) + rails-assets-jquery.slimscroll (= 1.3.6) + rails-assets-jquery.ui (= 1.11.4) + rails-assets-favico.js (0.3.9) rails-assets-highlightjs (8.6.0) rails-assets-jakobmattsson--jquery-elastic (1.6.11) rails-assets-jquery (>= 1.2.6) @@ -530,9 +534,7 @@ GEM rails-assets-jeresig--jquery.hotkeys (0.2.0) rails-assets-jquery (>= 1.4.2) rails-assets-jquery (1.11.2) - rails-assets-jquery-colorbox (1.5.15) - rails-assets-jquery (>= 1.3.2) - rails-assets-jquery-fullscreen (1.1.4) + rails-assets-jquery-fullscreen-plugin (0.5.0) rails-assets-jquery-placeholder (2.1.2) rails-assets-jquery (>= 1.6) rails-assets-jquery-simulate (1.0.1) @@ -540,10 +542,10 @@ GEM rails-assets-jquery (>= 1.7.0) rails-assets-jquery-textchange (0.2.3) rails-assets-jquery - rails-assets-jquery-ui (1.10.4) - rails-assets-jquery (>= 1.6) rails-assets-jquery.slimscroll (1.3.6) rails-assets-jquery (>= 1.7) + rails-assets-jquery.ui (1.11.4) + rails-assets-jquery (>= 1.6) rails-assets-markdown-it--markdown-it-for-inline (0.1.1) rails-assets-markdown-it (4.4.0) rails-assets-markdown-it-diaspora-mention (0.3.0) @@ -817,7 +819,7 @@ DEPENDENCIES rack-rewrite (= 1.5.1) rack-ssl (= 1.4.1) rails (= 4.2.3) - rails-assets-diaspora_jsxc (~> 0.1.1)! + rails-assets-diaspora_jsxc (~> 0.1.4.alpha, < 0.1.4.develop)! rails-assets-highlightjs (= 8.6.0)! rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)! rails-assets-jasmine-ajax (= 3.2.0)!