social_stream 0.22.0 → 0.22.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (37) hide show
  1. data/base/app/assets/javascripts/social_stream.search.js.erb +27 -0
  2. data/base/app/assets/stylesheets/activities.css.scss +2 -0
  3. data/base/app/controllers/search_controller.rb +5 -2
  4. data/base/app/helpers/activities_helper.rb +19 -0
  5. data/base/app/helpers/search_helper.rb +37 -7
  6. data/base/app/models/actor.rb +2 -1
  7. data/base/app/models/group.rb +2 -0
  8. data/base/app/views/activities/_likes.html.erb +5 -0
  9. data/base/app/views/activities/_root.html.erb +3 -0
  10. data/base/app/views/cheesecake/_cheesecake.html.erb +1 -1
  11. data/base/app/views/search/_form.html.erb +27 -48
  12. data/base/config/locales/en.yml +21 -3
  13. data/base/config/locales/es.yml +14 -3
  14. data/base/lib/social_stream/base/version.rb +1 -1
  15. data/documents/config/locales/en.yml +12 -3
  16. data/documents/config/locales/es.yml +12 -4
  17. data/documents/lib/social_stream/documents/version.rb +1 -1
  18. data/documents/lib/social_stream/toolbar_config/documents.rb +2 -2
  19. data/documents/social_stream-documents.gemspec +1 -1
  20. data/events/app/views/events/index.html.erb +2 -2
  21. data/events/config/locales/en.yml +4 -1
  22. data/events/config/locales/es.yml +4 -1
  23. data/events/lib/social_stream/events/version.rb +1 -1
  24. data/events/social_stream-events.gemspec +1 -1
  25. data/lib/social_stream/version.rb +1 -1
  26. data/presence/app/assets/javascripts/social_stream-presence.js +1 -0
  27. data/presence/app/assets/javascripts/xmpp_client_management.js.erb +14 -2
  28. data/presence/lib/social_stream/presence/engine.rb +6 -0
  29. data/presence/lib/social_stream/presence/models/group_manager.rb +41 -0
  30. data/presence/lib/social_stream/presence/version.rb +1 -1
  31. data/presence/lib/social_stream/presence/xmpp_server_order.rb +84 -10
  32. data/presence/lib/social_stream-presence.rb +1 -1
  33. data/presence/lib/tasks/presence/synchronize.rake +15 -0
  34. data/presence/social_stream-presence.gemspec +4 -4
  35. data/presence/vendor/assets/javascripts/strophe.muc.js +934 -0
  36. data/social_stream.gemspec +3 -3
  37. metadata +33 -29
data/social_stream.gemspec CHANGED
@@ -11,9 +11,9 @@ 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.3')
15
- s.add_runtime_dependency('social_stream-documents', '~> 0.11.1')
16
- s.add_runtime_dependency('social_stream-events', '~> 0.8.1')
14
+ s.add_runtime_dependency('social_stream-base', '~> 0.16.4')
15
+ s.add_runtime_dependency('social_stream-documents', '~> 0.11.2')
16
+ s.add_runtime_dependency('social_stream-events', '~> 0.8.2')
17
17
  s.add_runtime_dependency('social_stream-linkser', '~> 0.6.1')
18
18
  s.add_runtime_dependency('social_stream-presence', '~> 0.8.3')
19
19
 
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.22.0
4
+ version: 0.22.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,44 +10,44 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2012-02-28 00:00:00.000000000Z
13
+ date: 2012-03-01 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: social_stream-base
17
- requirement: &80182220 !ruby/object:Gem::Requirement
17
+ requirement: &76895720 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
21
21
  - !ruby/object:Gem::Version
22
- version: 0.16.3
22
+ version: 0.16.4
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *80182220
25
+ version_requirements: *76895720
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: social_stream-documents
28
- requirement: &80181900 !ruby/object:Gem::Requirement
28
+ requirement: &76895340 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ~>
32
32
  - !ruby/object:Gem::Version
33
- version: 0.11.1
33
+ version: 0.11.2
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *80181900
36
+ version_requirements: *76895340
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: social_stream-events
39
- requirement: &80181640 !ruby/object:Gem::Requirement
39
+ requirement: &76894830 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ~>
43
43
  - !ruby/object:Gem::Version
44
- version: 0.8.1
44
+ version: 0.8.2
45
45
  type: :runtime
46
46
  prerelease: false
47
- version_requirements: *80181640
47
+ version_requirements: *76894830
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: social_stream-linkser
50
- requirement: &80181260 !ruby/object:Gem::Requirement
50
+ requirement: &76894500 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ~>
@@ -55,10 +55,10 @@ dependencies:
55
55
  version: 0.6.1
56
56
  type: :runtime
57
57
  prerelease: false
58
- version_requirements: *80181260
58
+ version_requirements: *76894500
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: social_stream-presence
61
- requirement: &80180810 !ruby/object:Gem::Requirement
61
+ requirement: &76894170 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ~>
@@ -66,10 +66,10 @@ dependencies:
66
66
  version: 0.8.3
67
67
  type: :runtime
68
68
  prerelease: false
69
- version_requirements: *80180810
69
+ version_requirements: *76894170
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: capybara
72
- requirement: &80180510 !ruby/object:Gem::Requirement
72
+ requirement: &76893710 !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: *80180510
80
+ version_requirements: *76893710
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: sqlite3
83
- requirement: &80180070 !ruby/object:Gem::Requirement
83
+ requirement: &76893300 !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: *80180070
91
+ version_requirements: *76893300
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: ruby-debug19
94
- requirement: &80179570 !ruby/object:Gem::Requirement
94
+ requirement: &76892780 !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: *80179570
102
+ version_requirements: *76892780
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: rspec-rails
105
- requirement: &80179190 !ruby/object:Gem::Requirement
105
+ requirement: &76892350 !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: *80179190
113
+ version_requirements: *76892350
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: factory_girl
116
- requirement: &80178740 !ruby/object:Gem::Requirement
116
+ requirement: &76891780 !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: *80178740
124
+ version_requirements: *76891780
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: forgery
127
- requirement: &80178210 !ruby/object:Gem::Requirement
127
+ requirement: &76891290 !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: *80178210
135
+ version_requirements: *76891290
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: ci_reporter
138
- requirement: &80177720 !ruby/object:Gem::Requirement
138
+ requirement: &76890690 !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: *80177720
146
+ version_requirements: *76890690
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:
@@ -339,6 +339,7 @@ files:
339
339
  - base/app/assets/javascripts/search.js.erb
340
340
  - base/app/assets/javascripts/settings.js
341
341
  - base/app/assets/javascripts/social_stream-base.js
342
+ - base/app/assets/javascripts/social_stream.search.js.erb
342
343
  - base/app/assets/javascripts/social_stream.timeline.js
343
344
  - base/app/assets/javascripts/social_stream.wall.js.erb
344
345
  - base/app/assets/javascripts/ties.js
@@ -451,6 +452,7 @@ files:
451
452
  - base/app/views/activities/_child.html.erb
452
453
  - base/app/views/activities/_comments.html.erb
453
454
  - base/app/views/activities/_index.html.erb
455
+ - base/app/views/activities/_likes.html.erb
454
456
  - base/app/views/activities/_new.html.erb
455
457
  - base/app/views/activities/_options.html.erb
456
458
  - base/app/views/activities/_root.html.erb
@@ -1268,6 +1270,7 @@ files:
1268
1270
  - presence/lib/social_stream/migrations/presence.rb
1269
1271
  - presence/lib/social_stream/presence/engine.rb
1270
1272
  - presence/lib/social_stream/presence/models/buddy_manager.rb
1273
+ - presence/lib/social_stream/presence/models/group_manager.rb
1271
1274
  - presence/lib/social_stream/presence/version.rb
1272
1275
  - presence/lib/social_stream/presence/xmpp_server_order.rb
1273
1276
  - presence/lib/social_stream/presence/xmpp_ssclient.rb
@@ -1331,6 +1334,7 @@ files:
1331
1334
  - presence/vendor/assets/javascripts/jquery.tools.tooltip.js
1332
1335
  - presence/vendor/assets/javascripts/liquidmetal.js
1333
1336
  - presence/vendor/assets/javascripts/strophe.js
1337
+ - presence/vendor/assets/javascripts/strophe.muc.js
1334
1338
  - presence/vendor/assets/stylesheets/flexselect.css
1335
1339
  - presence/vendor/assets/stylesheets/jquery.ui.chatbox.css
1336
1340
  - social_stream.gemspec