social_stream 0.21.3 → 0.21.4

data/presence/lib/social_stream-presence.rb

@@ -38,6 +38,7 @@ module SocialStream
     @@remote_xmpp_server = false
     @@secure_rest_api = false
     @@enable = false
+    @@social_stream_presence_username = "social_stream_presence"
     
     class << self
       def setup

data/presence/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Presence
-    VERSION = "0.7.3"
+    VERSION = "0.7.5"
   end
 end

data/presence/social_stream-presence.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.16.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.16.2')
   
   s.add_runtime_dependency "xmpp4r"
 

data/social_stream.gemspec

@@ -11,11 +11,11 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.16.1')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.11.0')
-  s.add_runtime_dependency('social_stream-events', '~> 0.8.0')
-  s.add_runtime_dependency('social_stream-linkser', '~> 0.6.0')
-  s.add_runtime_dependency('social_stream-presence', '~> 0.7.3')
+  s.add_runtime_dependency('social_stream-base', '~> 0.16.2')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.11.1')
+  s.add_runtime_dependency('social_stream-events', '~> 0.8.1')
+  s.add_runtime_dependency('social_stream-linkser', '~> 0.6.1')
+  s.add_runtime_dependency('social_stream-presence', '~> 0.7.5')
  
   # Development Gem dependencies
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.21.3
+  version: 0.21.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,66 +10,66 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000Z
+date: 2012-02-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &81925040 !ruby/object:Gem::Requirement
+  requirement: &75850710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *81925040
+  version_requirements: *75850710
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &81924580 !ruby/object:Gem::Requirement
+  requirement: &75850300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
   type: :runtime
   prerelease: false
-  version_requirements: *81924580
+  version_requirements: *75850300
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &81924070 !ruby/object:Gem::Requirement
+  requirement: &75849860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *81924070
+  version_requirements: *75849860
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &81923660 !ruby/object:Gem::Requirement
+  requirement: &75849420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *81923660
+  version_requirements: *75849420
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
-  requirement: &81923270 !ruby/object:Gem::Requirement
+  requirement: &75848890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *81923270
+  version_requirements: *75848890
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &81922820 !ruby/object:Gem::Requirement
+  requirement: &75848390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *81922820
+  version_requirements: *75848390
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &81922530 !ruby/object:Gem::Requirement
+  requirement: &75848090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81922530
+  version_requirements: *75848090
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &81922120 !ruby/object:Gem::Requirement
+  requirement: &75847660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81922120
+  version_requirements: *75847660
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &81921700 !ruby/object:Gem::Requirement
+  requirement: &75847080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *81921700
+  version_requirements: *75847080
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &81921340 !ruby/object:Gem::Requirement
+  requirement: &75846630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *81921340
+  version_requirements: *75846630
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &81920980 !ruby/object:Gem::Requirement
+  requirement: &75846270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *81920980
+  version_requirements: *75846270
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &81920650 !ruby/object:Gem::Requirement
+  requirement: &75845900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,7 +143,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *81920650
+  version_requirements: *75845900
 description: Social Stream is a Ruby on Rails engine for building social network websites.
   It supports contacts, posts, file uploads, private messages and many more.
 email: 
@@ -469,6 +469,9 @@ files:
 - base/app/views/cheesecake/index.html.erb
 - base/app/views/cheesecake/update.js.erb
 - base/app/views/comments/_comment.html.erb
+- base/app/views/comments/_comment_focus_search.html.erb
+- base/app/views/comments/_comment_global_search.html.erb
+- base/app/views/comments/_comment_with_details.html.erb
 - base/app/views/comments/_new.html.erb
 - base/app/views/comments/create.js.erb
 - base/app/views/comments/destroy.js.erb
@@ -672,6 +675,7 @@ files:
 - base/lib/social_stream/controllers/cancan_devise_integration.rb
 - base/lib/social_stream/controllers/helpers.rb
 - base/lib/social_stream/controllers/i18n_integration.rb
+- base/lib/social_stream/controllers/mark_notifications_read.rb
 - base/lib/social_stream/controllers/objects.rb
 - base/lib/social_stream/controllers/subjects.rb
 - base/lib/social_stream/d3.rb
@@ -1211,6 +1215,8 @@ files:
 - presence/app/assets/javascripts/chat_persistence.js
 - presence/app/assets/javascripts/chat_utilities.js
 - presence/app/assets/javascripts/chat_window_manager.js
+- presence/app/assets/javascripts/jquery.flexselect.sstreampresence.js
+- presence/app/assets/javascripts/jquery.ui.chatbox.sstreampresence.js
 - presence/app/assets/javascripts/social_stream-presence.js
 - presence/app/assets/javascripts/store.js
 - presence/app/assets/javascripts/xmpp_client_management.js.erb
@@ -1218,10 +1224,8 @@ files:
 - presence/app/assets/stylesheets/social_stream-presence.css
 - presence/app/controllers/xmpp_controller.rb
 - presence/app/helpers/xmpp_helper.rb
-- presence/app/views/chat/_connecting.html.erb
 - presence/app/views/chat/_contacts.html.erb
 - presence/app/views/chat/_index.html.erb
-- presence/app/views/chat/_off.html.erb
 - presence/app/views/chat/_settings.html.erb
 - presence/app/views/xmpp/active_users.html.erb
 - presence/config/locales/en.yml
@@ -1314,9 +1318,7 @@ files:
 - presence/spec/demo/vendor/plugins/.gitkeep
 - presence/spec/discover.rb
 - presence/spec/spec_helper.rb
-- presence/vendor/assets/javascripts/jquery.flexselect.js
 - presence/vendor/assets/javascripts/jquery.tools.tooltip.js
-- presence/vendor/assets/javascripts/jquery.ui.chatbox.js
 - presence/vendor/assets/javascripts/liquidmetal.js
 - presence/vendor/assets/javascripts/strophe.js
 - presence/vendor/assets/stylesheets/flexselect.css

data/presence/app/views/chat/_connecting.html.erb

@@ -1,8 +0,0 @@
-      <div class="block">
-        <div class="header">
-          <%=image_tag("btn/btn_friend.png", :class => "header_icon")%>
-          <div class="header_text">
-            <%=t('chat.connecting')%>
-          </div>
-        </div>
-      </div>

data/presence/app/views/chat/_off.html.erb

@@ -1,54 +0,0 @@
-     <script type="text/javascript">
-				$(document).ready(function () {
-
-					if (authByCookie()){
-					  //Authentication by cookie
-            
-            $("#passwordFormChat").hide();
-            $('.connectChatButton').bind('click', function () {
-							if (requestConnectToChat()){
-								connectToChat(user_jid,cookie,null);
-							}
-            });
-            
-					} else {
-						//Authentication by password
-            
-            if ((window.sessionStorage) && (sessionStorage.getItem("ss_user_pass") != null)) {
-              $("#passwordFormChat").hide();
-            } else {
-              $("#passwordFormChat").show();
-            }
-            
-            $('.connectChatButton').bind('click', function () {
-							if (requestConnectToChat()) {
-								connectToChat(user_jid,null,$('#user_password').val());
-			        }
-            });
-          
-            $('.storePass').bind('click', function () {
-              storePassword();
-            });
-						
-					}
-					
-        });
-		
-      </script>
-			
-			<div class="block">
-        <div class="header">
-          <%=image_tag("btn/btn_friend.png", :class => "header_icon")%>
-          <div class="header_text">
-            <p id="chat_header_title"><%=t('chat.disconnected')%></p>
-          </div>
-        </div>
-      </div>
-  
-      <div class="chat_off">
-      	<div id="passwordFormChat">
-      	  <label for="user_password" class="chatPasswordTitle"><%=t('chat.password')%></label>
-          <input id="user_password" class="chat_password" type="password"></input>
-				</div>
-				<input class="connectChatButton storePass" value="Connect">
-      </div>