social_stream 0.20.2 → 0.21.0

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 (64) hide show
  1. data/base/app/assets/images/btn/permission_negative.png +0 -0
  2. data/base/app/assets/images/btn/permission_positive.png +0 -0
  3. data/base/app/assets/javascripts/activities.js.erb +2 -118
  4. data/base/app/assets/javascripts/social_stream-base.js +3 -0
  5. data/base/app/assets/javascripts/social_stream.timeline.js +42 -0
  6. data/base/app/assets/javascripts/social_stream.wall.js.erb +125 -0
  7. data/base/app/assets/stylesheets/cheesecake.css.scss +9 -1
  8. data/base/app/helpers/notifications_helper.rb +1 -5
  9. data/base/app/models/activity.rb +21 -2
  10. data/base/app/models/comment.rb +5 -0
  11. data/base/app/models/permission.rb +16 -1
  12. data/base/app/models/post.rb +5 -0
  13. data/base/app/views/activities/_new.html.erb +7 -6
  14. data/base/app/views/activities/_wall.html.erb +6 -0
  15. data/base/app/views/cheesecake/_index.html.erb +17 -0
  16. data/base/app/views/cheesecake/_sector_form.html.erb +15 -6
  17. data/base/app/views/comments/_new.html.erb +2 -2
  18. data/base/app/views/comments/create.js.erb +1 -3
  19. data/base/app/views/notifications/activities/_post.html.erb +0 -3
  20. data/base/app/views/permissions/_index.html.erb +2 -2
  21. data/base/app/views/posts/create.js.erb +1 -4
  22. data/base/config/locales/en.yml +33 -23
  23. data/base/config/locales/es.yml +53 -24
  24. data/base/db/migrate/20120208135718_group_title_and_description_in_activity_object.rb +52 -0
  25. data/base/lib/social_stream/base/version.rb +1 -1
  26. data/base/spec/factories/activity.rb +1 -1
  27. data/documents/db/migrate/20120208143721_documents_group_title_and_description_in_activity_object.rb +28 -0
  28. data/documents/lib/social_stream/documents/version.rb +1 -1
  29. data/documents/social_stream-documents.gemspec +1 -1
  30. data/documents/spec/factories/document.rb +1 -0
  31. data/documents/spec/factories/picture.rb +1 -0
  32. data/events/db/migrate/20120208143756_events_group_title_and_description_in_activity_object.rb +26 -0
  33. data/events/lib/social_stream/events/version.rb +1 -1
  34. data/events/social_stream-events.gemspec +1 -1
  35. data/lib/social_stream/version.rb +1 -1
  36. data/linkser/app/views/links/create.js.erb +1 -3
  37. data/linkser/db/migrate/20120208143739_linkser_group_title_and_description_in_activity_object.rb +30 -0
  38. data/linkser/lib/social_stream/linkser/version.rb +1 -1
  39. data/linkser/social_stream-linkser.gemspec +1 -1
  40. data/presence/app/assets/images/black_arrow7.png +0 -0
  41. data/presence/app/assets/images/black_arrow8.png +0 -0
  42. data/presence/app/assets/images/black_arrow9.png +0 -0
  43. data/presence/app/assets/javascripts/chat_interface_manager.js.erb +191 -23
  44. data/presence/app/assets/javascripts/chat_persistence.js +15 -6
  45. data/presence/app/assets/javascripts/chat_utilities.js +13 -0
  46. data/presence/app/assets/javascripts/chat_window_manager.js +101 -20
  47. data/presence/app/assets/javascripts/social_stream-presence.js +2 -0
  48. data/presence/app/assets/javascripts/xmpp_client_management.js.erb +6 -5
  49. data/presence/app/assets/stylesheets/chat.css.scss +43 -3
  50. data/presence/app/assets/stylesheets/social_stream-presence.css +1 -0
  51. data/presence/app/helpers/xmpp_helper.rb +4 -2
  52. data/presence/app/views/chat/_contacts.html.erb +55 -42
  53. data/presence/config/locales/en.yml +4 -1
  54. data/presence/config/locales/es.yml +3 -1
  55. data/presence/db/migrate/20110928135031_add_status_column_to_user.rb +1 -1
  56. data/presence/lib/social_stream/presence/version.rb +1 -1
  57. data/presence/social_stream-presence.gemspec +1 -1
  58. data/presence/vendor/assets/javascripts/jquery.flexselect.js +265 -0
  59. data/presence/vendor/assets/javascripts/jquery.tools.tooltip.js +2 -1
  60. data/presence/vendor/assets/javascripts/liquidmetal.js +90 -0
  61. data/presence/vendor/assets/stylesheets/flexselect.css +39 -0
  62. data/social_stream.gemspec +5 -5
  63. metadata +45 -32
  64. data/base/app/views/activities/_filter.html.erb +0 -83
@@ -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.15.2')
15
- s.add_runtime_dependency('social_stream-documents', '~> 0.10.2')
16
- s.add_runtime_dependency('social_stream-events', '~> 0.7.1')
17
- s.add_runtime_dependency('social_stream-linkser', '~> 0.5.0')
18
- s.add_runtime_dependency('social_stream-presence', '~> 0.6.2')
14
+ s.add_runtime_dependency('social_stream-base', '~> 0.16.0')
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.0')
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.20.2
4
+ version: 0.21.0
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-08 00:00:00.000000000Z
13
+ date: 2012-02-16 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: social_stream-base
17
- requirement: &72438540 !ruby/object:Gem::Requirement
17
+ requirement: &89152680 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
21
21
  - !ruby/object:Gem::Version
22
- version: 0.15.2
22
+ version: 0.16.0
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *72438540
25
+ version_requirements: *89152680
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: social_stream-documents
28
- requirement: &72438180 !ruby/object:Gem::Requirement
28
+ requirement: &89152430 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ~>
32
32
  - !ruby/object:Gem::Version
33
- version: 0.10.2
33
+ version: 0.11.0
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *72438180
36
+ version_requirements: *89152430
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: social_stream-events
39
- requirement: &72437820 !ruby/object:Gem::Requirement
39
+ requirement: &89152170 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ~>
43
43
  - !ruby/object:Gem::Version
44
- version: 0.7.1
44
+ version: 0.8.0
45
45
  type: :runtime
46
46
  prerelease: false
47
- version_requirements: *72437820
47
+ version_requirements: *89152170
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: social_stream-linkser
50
- requirement: &72437490 !ruby/object:Gem::Requirement
50
+ requirement: &89151920 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ~>
54
54
  - !ruby/object:Gem::Version
55
- version: 0.5.0
55
+ version: 0.6.0
56
56
  type: :runtime
57
57
  prerelease: false
58
- version_requirements: *72437490
58
+ version_requirements: *89151920
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: social_stream-presence
61
- requirement: &72437150 !ruby/object:Gem::Requirement
61
+ requirement: &89151570 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ~>
65
65
  - !ruby/object:Gem::Version
66
- version: 0.6.2
66
+ version: 0.7.0
67
67
  type: :runtime
68
68
  prerelease: false
69
- version_requirements: *72437150
69
+ version_requirements: *89151570
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: capybara
72
- requirement: &72436790 !ruby/object:Gem::Requirement
72
+ requirement: &89151210 !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: *72436790
80
+ version_requirements: *89151210
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: sqlite3
83
- requirement: &72436500 !ruby/object:Gem::Requirement
83
+ requirement: &89150740 !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: *72436500
91
+ version_requirements: *89150740
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: ruby-debug19
94
- requirement: &72436120 !ruby/object:Gem::Requirement
94
+ requirement: &89150280 !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: *72436120
102
+ version_requirements: *89150280
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: rspec-rails
105
- requirement: &72435750 !ruby/object:Gem::Requirement
105
+ requirement: &89150020 !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: *72435750
113
+ version_requirements: *89150020
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: factory_girl
116
- requirement: &72435360 !ruby/object:Gem::Requirement
116
+ requirement: &89149490 !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: *72435360
124
+ version_requirements: *89149490
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: forgery
127
- requirement: &72435030 !ruby/object:Gem::Requirement
127
+ requirement: &89148930 !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: *72435030
135
+ version_requirements: *89148930
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: ci_reporter
138
- requirement: &72434680 !ruby/object:Gem::Requirement
138
+ requirement: &89148520 !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: *72434680
146
+ version_requirements: *89148520
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:
@@ -254,6 +254,8 @@ files:
254
254
  - base/app/assets/images/btn/next_space.png
255
255
  - base/app/assets/images/btn/nolike.png
256
256
  - base/app/assets/images/btn/notifications.png
257
+ - base/app/assets/images/btn/permission_negative.png
258
+ - base/app/assets/images/btn/permission_positive.png
257
259
  - base/app/assets/images/btn/pixel.png
258
260
  - base/app/assets/images/btn/point_blue.png
259
261
  - base/app/assets/images/btn/point_gray.png
@@ -337,6 +339,8 @@ files:
337
339
  - base/app/assets/javascripts/search.js.erb
338
340
  - base/app/assets/javascripts/settings.js
339
341
  - base/app/assets/javascripts/social_stream-base.js
342
+ - base/app/assets/javascripts/social_stream.timeline.js
343
+ - base/app/assets/javascripts/social_stream.wall.js.erb
340
344
  - base/app/assets/javascripts/ties.js
341
345
  - base/app/assets/javascripts/toolbar.js
342
346
  - base/app/assets/javascripts/users.js
@@ -446,7 +450,6 @@ files:
446
450
  - base/app/views/activities/_activity.html.erb
447
451
  - base/app/views/activities/_child.html.erb
448
452
  - base/app/views/activities/_comments.html.erb
449
- - base/app/views/activities/_filter.html.erb
450
453
  - base/app/views/activities/_index.html.erb
451
454
  - base/app/views/activities/_new.html.erb
452
455
  - base/app/views/activities/_options.html.erb
@@ -650,6 +653,7 @@ files:
650
653
  - base/db/migrate/20120111120920_remove_language_default.rb
651
654
  - base/db/migrate/20120111141717_activity_channels.rb
652
655
  - base/db/migrate/20120201185454_singleton_single_relations.rb
656
+ - base/db/migrate/20120208135718_group_title_and_description_in_activity_object.rb
653
657
  - base/lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
654
658
  - base/lib/acts_as_taggable_on/social_stream.rb
655
659
  - base/lib/generators/social_stream/base/install_generator.rb
@@ -917,6 +921,7 @@ files:
917
921
  - documents/db/migrate/20110922173707_add_file_processing_to_document.rb
918
922
  - documents/db/migrate/20111005112707_add_title_and_description_to_document.rb
919
923
  - documents/db/migrate/20120109155431_document_object_type.rb
924
+ - documents/db/migrate/20120208143721_documents_group_title_and_description_in_activity_object.rb
920
925
  - documents/lib/delayed_paperclip/social_stream-documents.rb
921
926
  - documents/lib/generators/social_stream/documents/install_generator.rb
922
927
  - documents/lib/paperclip/social_stream-documents.rb
@@ -1021,6 +1026,7 @@ files:
1021
1026
  - events/db/migrate/20111120104349_create_rooms.rb
1022
1027
  - events/db/migrate/20111204155637_add_scheduler.rb
1023
1028
  - events/db/migrate/20111218203314_change_scheduler.rb
1029
+ - events/db/migrate/20120208143756_events_group_title_and_description_in_activity_object.rb
1024
1030
  - events/db/migrate/20120208144948_add_events_foreign_key.rb
1025
1031
  - events/lib/generators/social_stream/events/install_generator.rb
1026
1032
  - events/lib/social_stream-events.rb
@@ -1080,6 +1086,7 @@ files:
1080
1086
  - linkser/db/migrate/20111129100618_create_social_stream_linkser.rb
1081
1087
  - linkser/db/migrate/20111219122952_add_width_height_to_link.rb
1082
1088
  - linkser/db/migrate/20120202104549_add_links_foreign_key.rb
1089
+ - linkser/db/migrate/20120208143739_linkser_group_title_and_description_in_activity_object.rb
1083
1090
  - linkser/lib/generators/social_stream/linkser/install_generator.rb
1084
1091
  - linkser/lib/social_stream-linkser.rb
1085
1092
  - linkser/lib/social_stream/linkser/engine.rb
@@ -1181,6 +1188,9 @@ files:
1181
1188
  - presence/app/assets/audio/chat/onMessageAudio.mp3
1182
1189
  - presence/app/assets/audio/chat/onMessageAudio.wav
1183
1190
  - presence/app/assets/images/black_arrow3.png
1191
+ - presence/app/assets/images/black_arrow7.png
1192
+ - presence/app/assets/images/black_arrow8.png
1193
+ - presence/app/assets/images/black_arrow9.png
1184
1194
  - presence/app/assets/images/emoticons/beer.png
1185
1195
  - presence/app/assets/images/emoticons/clock.png
1186
1196
  - presence/app/assets/images/emoticons/face-raspberry.png
@@ -1304,9 +1314,12 @@ files:
1304
1314
  - presence/spec/demo/vendor/plugins/.gitkeep
1305
1315
  - presence/spec/discover.rb
1306
1316
  - presence/spec/spec_helper.rb
1317
+ - presence/vendor/assets/javascripts/jquery.flexselect.js
1307
1318
  - presence/vendor/assets/javascripts/jquery.tools.tooltip.js
1308
1319
  - presence/vendor/assets/javascripts/jquery.ui.chatbox.js
1320
+ - presence/vendor/assets/javascripts/liquidmetal.js
1309
1321
  - presence/vendor/assets/javascripts/strophe.js
1322
+ - presence/vendor/assets/stylesheets/flexselect.css
1310
1323
  - presence/vendor/assets/stylesheets/jquery.ui.chatbox.css
1311
1324
  - social_stream.gemspec
1312
1325
  - social_stream.thor
@@ -1,83 +0,0 @@
1
- <% content_for :javascript do %>
2
- $(function() {
3
- /**
4
- * the element
5
- */
6
- var $ui = $('#form_filter');
7
- var $ui_really = $('#ul_filter');
8
- /**
9
- * on focus and on click display the dropdown,
10
- * and change the arrow image
11
- */
12
- /*$ui.find('.sb_down').bind('focus click',function()*/
13
- $ui.find('.sb_down').bind('mouseover',function()
14
- {
15
- $ui.find('.sb_down')
16
- .addClass('sb_up')
17
- .removeClass('sb_down')
18
- .andSelf()
19
- .find('.sb_dropdown')
20
- .show();
21
- /*$ui.find('.sb_up')
22
- .hide();*/
23
- });
24
-
25
- /**
26
- * on mouse leave hide the dropdown,
27
- * and change the arrow image
28
- */
29
-
30
- $ui_really.bind('mouseleave',function(){
31
-
32
- $ui.find('.sb_up')
33
- .addClass('sb_down')
34
- .removeClass('sb_up')
35
- .andSelf()
36
- .find('.sb_dropdown')
37
- .hide();
38
- /*$ui.find('.sb_down')
39
- .show();*/
40
- });
41
-
42
- /**
43
- * selecting all checkboxes
44
- */
45
- $ui.find('.sb_dropdown').find('label[for="all"]').prev().bind('click',function(){
46
- $(this).parent().siblings().find(':checkbox').attr('checked',this.checked).attr('disabled',this.checked);
47
- });
48
- });
49
- <% end %>
50
-
51
- <div id="filter_div">
52
- <%= form_tag "/activities/documents", :method => :post ,:id=> 'form_filter', :class => "tie_form",:remote=> true do %>
53
- <span class="sb_down">Filter</span>
54
- <ul class="sb_dropdown" style="display:none;" id="ul_filter">
55
-
56
- <li>
57
- <%= check_box_tag 'types', 'Documents', false, :class => 'accept_tos',:onchange=>'$(\'#form_filter\').submit();'%>
58
- <label for="<%=t('activity.view.documents')%>"><%=t('activity.view.documents')%></label>
59
- </li>
60
- <li>
61
- <%= check_box_tag 'types', 'Audio', false, :class => 'accept_tos',:onchange=>'$(\'#form_filter\').submit();'%>
62
- <label for="t('activity.view.audio')"><%=t('activity.view.audio')%></label>
63
- </li>
64
- <li>
65
- <%= check_box_tag 'types', 'Event', false, :class => 'accept_tos',:onchange=>'$(\'#form_filter\').submit();'%>
66
- <label for="<%=t('activity.view.event')%>"><%=t('activity.view.event')%></label>
67
- </li>
68
- <li>
69
- <%= check_box_tag 'types', 'Picture', false, :class => 'accept_tos',:onchange=>'$(\'#form_filter\').submit();'%>
70
- <label for="<%=t('activity.view.photos')%>"><%=t('activity.view.photos')%></label>
71
- </li>
72
- <li>
73
- <%= check_box_tag 'types', 'Post', false, :class => 'accept_tos',:onchange=>'$(\'#form_filter\').submit();'%>
74
- <label for="<%=t('activity.view.post')%>"><%=t('activity.view.post')%></label>
75
- </li>
76
- <li>
77
- <%= check_box_tag 'types', 'Video', false, :class => 'accept_tos',:onchange=>'$(\'#form_filter\').submit();'%>
78
- <label for="<%=t('activity.view.video')%>"><%=t('activity.view.video')%></label>
79
- </li>
80
- </ul>
81
- <% end %>
82
- </div>
83
-