social_stream 0.21.3 → 0.21.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (52) hide show
  1. data/base/app/assets/stylesheets/base.css.scss +1 -1
  2. data/base/app/assets/stylesheets/header.css.scss +1 -1
  3. data/base/app/helpers/notifications_helper.rb +6 -0
  4. data/base/app/models/activity.rb +13 -0
  5. data/base/app/models/comment.rb +7 -0
  6. data/base/app/models/post.rb +1 -1
  7. data/base/app/views/comments/_comment_focus_search.html.erb +37 -0
  8. data/base/app/views/comments/_comment_global_search.html.erb +18 -0
  9. data/base/app/views/comments/_comment_with_details.html.erb +3 -0
  10. data/base/app/views/notifications/_index.html.erb +1 -0
  11. data/base/app/views/notifications/activities/_like.html.erb +4 -4
  12. data/base/app/views/notifications/activities/_like.text.erb +2 -2
  13. data/base/app/views/notifications/activities/_post.html.erb +2 -2
  14. data/base/app/views/notifications/activities/_post.text.erb +1 -1
  15. data/base/app/views/notifications/activities/_update.html.erb +3 -3
  16. data/base/app/views/notifications/activities/_update.text.erb +3 -3
  17. data/base/lib/social_stream-base.rb +2 -1
  18. data/base/lib/social_stream/base/engine.rb +1 -0
  19. data/base/lib/social_stream/base/version.rb +1 -1
  20. data/base/lib/social_stream/controllers/mark_notifications_read.rb +19 -0
  21. data/documents/app/models/audio.rb +2 -2
  22. data/documents/app/models/document.rb +2 -2
  23. data/documents/app/models/picture.rb +2 -2
  24. data/documents/app/models/video.rb +2 -2
  25. data/documents/lib/social_stream/documents/version.rb +1 -1
  26. data/documents/social_stream-documents.gemspec +1 -1
  27. data/events/lib/social_stream/events/version.rb +1 -1
  28. data/events/social_stream-events.gemspec +1 -1
  29. data/lib/social_stream/version.rb +1 -1
  30. data/linkser/app/models/link.rb +2 -2
  31. data/linkser/lib/social_stream/linkser/version.rb +1 -1
  32. data/linkser/social_stream-linkser.gemspec +1 -1
  33. data/presence/app/assets/javascripts/chat_interface_manager.js.erb +264 -143
  34. data/presence/app/assets/javascripts/chat_persistence.js +3 -5
  35. data/presence/app/assets/javascripts/chat_utilities.js +6 -0
  36. data/presence/app/assets/javascripts/chat_window_manager.js +9 -1
  37. data/presence/{vendor/assets/javascripts/jquery.flexselect.js → app/assets/javascripts/jquery.flexselect.sstreampresence.js} +16 -8
  38. data/presence/{vendor/assets/javascripts/jquery.ui.chatbox.js → app/assets/javascripts/jquery.ui.chatbox.sstreampresence.js} +0 -0
  39. data/presence/app/assets/javascripts/social_stream-presence.js +2 -2
  40. data/presence/app/assets/javascripts/xmpp_client_management.js.erb +8 -21
  41. data/presence/app/assets/stylesheets/chat.css.scss +17 -13
  42. data/presence/app/controllers/xmpp_controller.rb +1 -4
  43. data/presence/app/helpers/xmpp_helper.rb +6 -15
  44. data/presence/app/views/chat/_contacts.html.erb +16 -63
  45. data/presence/app/views/chat/_index.html.erb +83 -15
  46. data/presence/lib/social_stream-presence.rb +1 -0
  47. data/presence/lib/social_stream/presence/version.rb +1 -1
  48. data/presence/social_stream-presence.gemspec +1 -1
  49. data/social_stream.gemspec +5 -5
  50. metadata +37 -35
  51. data/presence/app/views/chat/_connecting.html.erb +0 -8
  52. data/presence/app/views/chat/_off.html.erb +0 -54
data/presence/lib/social_stream-presence.rb CHANGED
@@ -38,6 +38,7 @@ module SocialStream
38
38
  @@remote_xmpp_server = false
39
39
  @@secure_rest_api = false
40
40
  @@enable = false
41
+ @@social_stream_presence_username = "social_stream_presence"
41
42
 
42
43
  class << self
43
44
  def setup
data/presence/lib/social_stream/presence/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Presence
3
- VERSION = "0.7.3"
3
+ VERSION = "0.7.5"
4
4
  end
5
5
  end
data/presence/social_stream-presence.gemspec CHANGED
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
19
19
  s.require_paths = ["lib"]
20
20
 
21
21
  # Gem dependencies
22
- s.add_runtime_dependency('social_stream-base', '~> 0.16.1')
22
+ s.add_runtime_dependency('social_stream-base', '~> 0.16.2')
23
23
 
24
24
  s.add_runtime_dependency "xmpp4r"
25
25
 
data/social_stream.gemspec CHANGED
@@ -11,11 +11,11 @@ Gem::Specification.new do |s|
11
11
  s.files = `git ls-files`.split("\n")
12
12
 
13
13
  # Gem dependencies
14
- s.add_runtime_dependency('social_stream-base', '~> 0.16.1')
15
- s.add_runtime_dependency('social_stream-documents', '~> 0.11.0')
16
- s.add_runtime_dependency('social_stream-events', '~> 0.8.0')
17
- s.add_runtime_dependency('social_stream-linkser', '~> 0.6.0')
18
- s.add_runtime_dependency('social_stream-presence', '~> 0.7.3')
14
+ s.add_runtime_dependency('social_stream-base', '~> 0.16.2')
15
+ s.add_runtime_dependency('social_stream-documents', '~> 0.11.1')
16
+ s.add_runtime_dependency('social_stream-events', '~> 0.8.1')
17
+ s.add_runtime_dependency('social_stream-linkser', '~> 0.6.1')
18
+ s.add_runtime_dependency('social_stream-presence', '~> 0.7.5')
19
19
 
20
20
  # Development Gem dependencies
21
21
  #
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: social_stream
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.21.3
4
+ version: 0.21.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,66 +10,66 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2012-02-16 00:00:00.000000000Z
13
+ date: 2012-02-21 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: social_stream-base
17
- requirement: &81925040 !ruby/object:Gem::Requirement
17
+ requirement: &75850710 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
21
21
  - !ruby/object:Gem::Version
22
- version: 0.16.1
22
+ version: 0.16.2
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *81925040
25
+ version_requirements: *75850710
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: social_stream-documents
28
- requirement: &81924580 !ruby/object:Gem::Requirement
28
+ requirement: &75850300 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ~>
32
32
  - !ruby/object:Gem::Version
33
- version: 0.11.0
33
+ version: 0.11.1
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *81924580
36
+ version_requirements: *75850300
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: social_stream-events
39
- requirement: &81924070 !ruby/object:Gem::Requirement
39
+ requirement: &75849860 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ~>
43
43
  - !ruby/object:Gem::Version
44
- version: 0.8.0
44
+ version: 0.8.1
45
45
  type: :runtime
46
46
  prerelease: false
47
- version_requirements: *81924070
47
+ version_requirements: *75849860
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: social_stream-linkser
50
- requirement: &81923660 !ruby/object:Gem::Requirement
50
+ requirement: &75849420 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ~>
54
54
  - !ruby/object:Gem::Version
55
- version: 0.6.0
55
+ version: 0.6.1
56
56
  type: :runtime
57
57
  prerelease: false
58
- version_requirements: *81923660
58
+ version_requirements: *75849420
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: social_stream-presence
61
- requirement: &81923270 !ruby/object:Gem::Requirement
61
+ requirement: &75848890 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ~>
65
65
  - !ruby/object:Gem::Version
66
- version: 0.7.3
66
+ version: 0.7.5
67
67
  type: :runtime
68
68
  prerelease: false
69
- version_requirements: *81923270
69
+ version_requirements: *75848890
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: capybara
72
- requirement: &81922820 !ruby/object:Gem::Requirement
72
+ requirement: &75848390 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ~>
@@ -77,10 +77,10 @@ dependencies:
77
77
  version: 0.3.9
78
78
  type: :development
79
79
  prerelease: false
80
- version_requirements: *81922820
80
+ version_requirements: *75848390
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: sqlite3
83
- requirement: &81922530 !ruby/object:Gem::Requirement
83
+ requirement: &75848090 !ruby/object:Gem::Requirement
84
84
  none: false
85
85
  requirements:
86
86
  - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
88
88
  version: '0'
89
89
  type: :development
90
90
  prerelease: false
91
- version_requirements: *81922530
91
+ version_requirements: *75848090
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: ruby-debug19
94
- requirement: &81922120 !ruby/object:Gem::Requirement
94
+ requirement: &75847660 !ruby/object:Gem::Requirement
95
95
  none: false
96
96
  requirements:
97
97
  - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
99
99
  version: '0'
100
100
  type: :development
101
101
  prerelease: false
102
- version_requirements: *81922120
102
+ version_requirements: *75847660
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: rspec-rails
105
- requirement: &81921700 !ruby/object:Gem::Requirement
105
+ requirement: &75847080 !ruby/object:Gem::Requirement
106
106
  none: false
107
107
  requirements:
108
108
  - - ~>
@@ -110,10 +110,10 @@ dependencies:
110
110
  version: 2.8.0
111
111
  type: :development
112
112
  prerelease: false
113
- version_requirements: *81921700
113
+ version_requirements: *75847080
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: factory_girl
116
- requirement: &81921340 !ruby/object:Gem::Requirement
116
+ requirement: &75846630 !ruby/object:Gem::Requirement
117
117
  none: false
118
118
  requirements:
119
119
  - - ~>
@@ -121,10 +121,10 @@ dependencies:
121
121
  version: 1.3.2
122
122
  type: :development
123
123
  prerelease: false
124
- version_requirements: *81921340
124
+ version_requirements: *75846630
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: forgery
127
- requirement: &81920980 !ruby/object:Gem::Requirement
127
+ requirement: &75846270 !ruby/object:Gem::Requirement
128
128
  none: false
129
129
  requirements:
130
130
  - - ~>
@@ -132,10 +132,10 @@ dependencies:
132
132
  version: 0.4.2
133
133
  type: :development
134
134
  prerelease: false
135
- version_requirements: *81920980
135
+ version_requirements: *75846270
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: ci_reporter
138
- requirement: &81920650 !ruby/object:Gem::Requirement
138
+ requirement: &75845900 !ruby/object:Gem::Requirement
139
139
  none: false
140
140
  requirements:
141
141
  - - ~>
@@ -143,7 +143,7 @@ dependencies:
143
143
  version: 1.6.4
144
144
  type: :development
145
145
  prerelease: false
146
- version_requirements: *81920650
146
+ version_requirements: *75845900
147
147
  description: Social Stream is a Ruby on Rails engine for building social network websites.
148
148
  It supports contacts, posts, file uploads, private messages and many more.
149
149
  email:
@@ -469,6 +469,9 @@ files:
469
469
  - base/app/views/cheesecake/index.html.erb
470
470
  - base/app/views/cheesecake/update.js.erb
471
471
  - base/app/views/comments/_comment.html.erb
472
+ - base/app/views/comments/_comment_focus_search.html.erb
473
+ - base/app/views/comments/_comment_global_search.html.erb
474
+ - base/app/views/comments/_comment_with_details.html.erb
472
475
  - base/app/views/comments/_new.html.erb
473
476
  - base/app/views/comments/create.js.erb
474
477
  - base/app/views/comments/destroy.js.erb
@@ -672,6 +675,7 @@ files:
672
675
  - base/lib/social_stream/controllers/cancan_devise_integration.rb
673
676
  - base/lib/social_stream/controllers/helpers.rb
674
677
  - base/lib/social_stream/controllers/i18n_integration.rb
678
+ - base/lib/social_stream/controllers/mark_notifications_read.rb
675
679
  - base/lib/social_stream/controllers/objects.rb
676
680
  - base/lib/social_stream/controllers/subjects.rb
677
681
  - base/lib/social_stream/d3.rb
@@ -1211,6 +1215,8 @@ files:
1211
1215
  - presence/app/assets/javascripts/chat_persistence.js
1212
1216
  - presence/app/assets/javascripts/chat_utilities.js
1213
1217
  - presence/app/assets/javascripts/chat_window_manager.js
1218
+ - presence/app/assets/javascripts/jquery.flexselect.sstreampresence.js
1219
+ - presence/app/assets/javascripts/jquery.ui.chatbox.sstreampresence.js
1214
1220
  - presence/app/assets/javascripts/social_stream-presence.js
1215
1221
  - presence/app/assets/javascripts/store.js
1216
1222
  - presence/app/assets/javascripts/xmpp_client_management.js.erb
@@ -1218,10 +1224,8 @@ files:
1218
1224
  - presence/app/assets/stylesheets/social_stream-presence.css
1219
1225
  - presence/app/controllers/xmpp_controller.rb
1220
1226
  - presence/app/helpers/xmpp_helper.rb
1221
- - presence/app/views/chat/_connecting.html.erb
1222
1227
  - presence/app/views/chat/_contacts.html.erb
1223
1228
  - presence/app/views/chat/_index.html.erb
1224
- - presence/app/views/chat/_off.html.erb
1225
1229
  - presence/app/views/chat/_settings.html.erb
1226
1230
  - presence/app/views/xmpp/active_users.html.erb
1227
1231
  - presence/config/locales/en.yml
@@ -1314,9 +1318,7 @@ files:
1314
1318
  - presence/spec/demo/vendor/plugins/.gitkeep
1315
1319
  - presence/spec/discover.rb
1316
1320
  - presence/spec/spec_helper.rb
1317
- - presence/vendor/assets/javascripts/jquery.flexselect.js
1318
1321
  - presence/vendor/assets/javascripts/jquery.tools.tooltip.js
1319
- - presence/vendor/assets/javascripts/jquery.ui.chatbox.js
1320
1322
  - presence/vendor/assets/javascripts/liquidmetal.js
1321
1323
  - presence/vendor/assets/javascripts/strophe.js
1322
1324
  - presence/vendor/assets/stylesheets/flexselect.css
data/presence/app/views/chat/_connecting.html.erb DELETED
@@ -1,8 +0,0 @@
1
- <div class="block">
2
- <div class="header">
3
- <%=image_tag("btn/btn_friend.png", :class => "header_icon")%>
4
- <div class="header_text">
5
- <%=t('chat.connecting')%>
6
- </div>
7
- </div>
8
- </div>
data/presence/app/views/chat/_off.html.erb DELETED
@@ -1,54 +0,0 @@
1
- <script type="text/javascript">
2
- $(document).ready(function () {
3
-
4
- if (authByCookie()){
5
- //Authentication by cookie
6
-
7
- $("#passwordFormChat").hide();
8
- $('.connectChatButton').bind('click', function () {
9
- if (requestConnectToChat()){
10
- connectToChat(user_jid,cookie,null);
11
- }
12
- });
13
-
14
- } else {
15
- //Authentication by password
16
-
17
- if ((window.sessionStorage) && (sessionStorage.getItem("ss_user_pass") != null)) {
18
- $("#passwordFormChat").hide();
19
- } else {
20
- $("#passwordFormChat").show();
21
- }
22
-
23
- $('.connectChatButton').bind('click', function () {
24
- if (requestConnectToChat()) {
25
- connectToChat(user_jid,null,$('#user_password').val());
26
- }
27
- });
28
-
29
- $('.storePass').bind('click', function () {
30
- storePassword();
31
- });
32
-
33
- }
34
-
35
- });
36
-
37
- </script>
38
-
39
- <div class="block">
40
- <div class="header">
41
- <%=image_tag("btn/btn_friend.png", :class => "header_icon")%>
42
- <div class="header_text">
43
- <p id="chat_header_title"><%=t('chat.disconnected')%></p>
44
- </div>
45
- </div>
46
- </div>
47
-
48
- <div class="chat_off">
49
- <div id="passwordFormChat">
50
- <label for="user_password" class="chatPasswordTitle"><%=t('chat.password')%></label>
51
- <input id="user_password" class="chat_password" type="password"></input>
52
- </div>
53
- <input class="connectChatButton storePass" value="Connect">
54
- </div>