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

Merge pull request #6570 from Zauberstuhl/bump_jsxc_develop

Browse source 
[develop] bump jsxc to v0.1.5.develop
This commit is contained in:
Steffen van Bergerem 2015-12-20 15:58:13 +01:00
commit 7f146a8af9
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -155,7 +155,7 @@ gem "active_model_serializers", "0.9.3"
# XMPP chat dependencies
gem "diaspora-vines", "~> 0.2.0.develop"
gem "rails-assets-diaspora_jsxc", "~> 0.1.4.develop", source: "https://rails-assets.org"
gem "rails-assets-diaspora_jsxc", "~> 0.1.5.develop", source: "https://rails-assets.org"
# Tags

21
Gemfile.lock
View file

@ -563,14 +563,14 @@ GEM
sprockets-rails
rails-assets-autosize (3.0.14)
rails-assets-blueimp-gallery (2.16.0)
rails-assets-diaspora_jsxc (0.1.4.develop.4)
rails-assets-favico.js (= 0.3.9)
rails-assets-jquery (= 1.11.2)
rails-assets-jquery-colorbox (= 1.6.3)
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-diaspora_jsxc (0.1.5.develop.1)
rails-assets-favico.js (~> 0.3.9)
rails-assets-jquery (>= 1.11)
rails-assets-jquery-colorbox (~> 1.6.3)
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.10)
rails-assets-highlightjs (8.9.1)
rails-assets-jakobmattsson--jquery-elastic (1.6.11)
rails-assets-jquery (>= 1.2.6)
@ -587,8 +587,7 @@ GEM
rails-assets-jquery (>= 1.6)
rails-assets-jquery-textchange (0.2.3)
rails-assets-jquery
rails-assets-jquery.slimscroll (1.3.6)
rails-assets-jquery (>= 1.7)
rails-assets-jquery.slimscroll (1.3.7)
rails-assets-jquery.ui (1.11.4)
rails-assets-jquery (>= 1.6)
rails-assets-markdown-it--markdown-it-for-inline (0.1.1)
@ -888,7 +887,7 @@ DEPENDENCIES
rails (= 4.2.5)
rails-assets-autosize (= 3.0.14)!
rails-assets-blueimp-gallery (= 2.16.0)!
rails-assets-diaspora_jsxc (~> 0.1.4.develop)!
rails-assets-diaspora_jsxc (~> 0.1.5.develop)!
rails-assets-highlightjs (= 8.9.1)!
rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)!
rails-assets-jasmine-ajax (= 3.2.0)!

4
app/assets/javascripts/jsxc.js
View file

@ -1,4 +1,4 @@
//= require jquery.slimscroll
//= require jquery.slimscroll/jquery.slimscroll
//= require jquery-colorbox
//= require favico.js
//= require jquery-fullscreen-plugin
@ -24,7 +24,7 @@ $(document).ready(function() {
chat: 1
},
displayRosterMinimized: function() {
return true;
return false;
},
xmpp: {
url: $('script#jsxc').data('endpoint'),