social_stream-base 0.16.3 → 0.16.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.
- data/app/assets/javascripts/social_stream.search.js.erb +27 -0
- data/app/assets/stylesheets/activities.css.scss +2 -0
- data/app/controllers/search_controller.rb +5 -2
- data/app/helpers/activities_helper.rb +19 -0
- data/app/helpers/search_helper.rb +37 -7
- data/app/models/actor.rb +2 -1
- data/app/models/group.rb +2 -0
- data/app/views/activities/_likes.html.erb +5 -0
- data/app/views/activities/_root.html.erb +3 -0
- data/app/views/cheesecake/_cheesecake.html.erb +1 -1
- data/app/views/search/_form.html.erb +27 -48
- data/config/locales/en.yml +21 -3
- data/config/locales/es.yml +14 -3
- data/lib/social_stream/base/version.rb +1 -1
- metadata +68 -66
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
SocialStream.Search = (function(SS, $, undefined){
|
|
2
|
+
function init(){
|
|
3
|
+
$.preloadImages ("<%= asset_path "mini-loading.gif" %>");
|
|
4
|
+
|
|
5
|
+
$('#search_form').submit(function() {
|
|
6
|
+
query = $('#global_search_input').val();
|
|
7
|
+
if((query=="")||(query.length < 2)||(query == I18n.t('search.write'))){
|
|
8
|
+
$('#too_short_error').show();
|
|
9
|
+
$('#global_search_input').removeClass("searching");
|
|
10
|
+
$('#global_search_input').blur();
|
|
11
|
+
$('#global_search_input').focus();
|
|
12
|
+
return false;
|
|
13
|
+
}else{
|
|
14
|
+
$('#global_search_input').addClass("searching");
|
|
15
|
+
$('#global_search_input').blur();
|
|
16
|
+
}
|
|
17
|
+
return true;
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
$("#global_search_input").Watermark(I18n.t('search.write'));
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
return {
|
|
24
|
+
init: init
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
}) (SocialStream, jQuery);
|
|
@@ -26,8 +26,11 @@ class SearchController < ApplicationController
|
|
|
26
26
|
private
|
|
27
27
|
|
|
28
28
|
def search mode
|
|
29
|
-
models =
|
|
30
|
-
|
|
29
|
+
models = ( mode.to_s.eql?("quick") ?
|
|
30
|
+
SocialStream.extended_search_models :
|
|
31
|
+
SocialStream.quick_search_models
|
|
32
|
+
).dup
|
|
33
|
+
|
|
31
34
|
models.map! {|model_sym| model_sym.to_s.classify.constantize}
|
|
32
35
|
result = ThinkingSphinx.search(get_search_query, :classes => models)
|
|
33
36
|
result = authorization_filter result
|
|
@@ -34,4 +34,23 @@ module ActivitiesHelper
|
|
|
34
34
|
Post.new :author_id => Actor.normalize_id(current_subject),
|
|
35
35
|
:owner_id => Actor.normalize_id(receiver)
|
|
36
36
|
end
|
|
37
|
+
|
|
38
|
+
def like_sentence(activity)
|
|
39
|
+
likers_shown = 3
|
|
40
|
+
likers_count = activity.likes.count
|
|
41
|
+
likers_other = likers_count - likers_shown
|
|
42
|
+
|
|
43
|
+
# TODO: select likers from current_subject's contacts
|
|
44
|
+
likers =
|
|
45
|
+
activity.likes.first(likers_shown).
|
|
46
|
+
map{ |a| a.sender_subject }.
|
|
47
|
+
map{ |l| link_to l.name, l }.
|
|
48
|
+
join(", ")
|
|
49
|
+
|
|
50
|
+
if likers_other > 0
|
|
51
|
+
t("activity.like_sentence.many", :likers => likers, :count => likers_other).html_safe
|
|
52
|
+
else
|
|
53
|
+
t("activity.like_sentence.few", :likers => likers, :count => likers_count).html_safe
|
|
54
|
+
end
|
|
55
|
+
end
|
|
37
56
|
end
|
|
@@ -1,10 +1,4 @@
|
|
|
1
1
|
module SearchHelper
|
|
2
|
-
|
|
3
|
-
def focus_search_link text, search_class, query
|
|
4
|
-
search_class = search_class.to_s if search_class.is_a? Class or search_class.is_a? Symbol
|
|
5
|
-
link_to text, search_path(:focus => search_class.downcase.pluralize, :search_query => query ), :remote => true
|
|
6
|
-
end
|
|
7
|
-
|
|
8
2
|
def too_short_query?
|
|
9
3
|
return true if params[:search_query].blank?
|
|
10
4
|
bare_query = strip_tags(params[:search_query]) unless bare_query.html_safe?
|
|
@@ -35,4 +29,40 @@ module SearchHelper
|
|
|
35
29
|
bare_query = strip_tags(params[:search_query]) unless bare_query.html_safe?
|
|
36
30
|
return bare_query.strip.split
|
|
37
31
|
end
|
|
38
|
-
|
|
32
|
+
|
|
33
|
+
def search_class(type, model_sym)
|
|
34
|
+
case type
|
|
35
|
+
when :selected
|
|
36
|
+
params[:focus].present? &&
|
|
37
|
+
params[:focus].eql?(model_sym.to_s) &&
|
|
38
|
+
'selected' || ''
|
|
39
|
+
when :disabled
|
|
40
|
+
search_results?(model_sym) &&
|
|
41
|
+
'' || 'disabled'
|
|
42
|
+
else
|
|
43
|
+
raise "Unknown select search class type"
|
|
44
|
+
end
|
|
45
|
+
end
|
|
46
|
+
|
|
47
|
+
def search_results?(model_sym)
|
|
48
|
+
ThinkingSphinx.count(get_search_query,
|
|
49
|
+
:classes => [model_sym.to_s.classify.constantize]) > 0
|
|
50
|
+
end
|
|
51
|
+
|
|
52
|
+
def search_tab(model_sym)
|
|
53
|
+
span_options = {}
|
|
54
|
+
span_options[:class] = "#{ search_class(:selected, model_sym) } #{ search_class(:disabled, model_sym) } #{ model_sym.to_s.pluralize.downcase }"
|
|
55
|
+
|
|
56
|
+
results = search_results?(model_sym)
|
|
57
|
+
|
|
58
|
+
unless results
|
|
59
|
+
span_options[:title] = t('search.no_subject_found', :subject => model_sym.to_s)
|
|
60
|
+
end
|
|
61
|
+
|
|
62
|
+
link_to_if results,
|
|
63
|
+
content_tag(:span, t("#{ model_sym }.title.other"), span_options),
|
|
64
|
+
search_path(:focus => model_sym,
|
|
65
|
+
:search_query => params[:search_query]),
|
|
66
|
+
:remote => true
|
|
67
|
+
end
|
|
68
|
+
end
|
data/app/models/actor.rb
CHANGED
data/app/models/group.rb
CHANGED
|
@@ -19,6 +19,9 @@
|
|
|
19
19
|
<%= render :partial => 'activities/options',
|
|
20
20
|
:locals => { :activity => activity } %>
|
|
21
21
|
|
|
22
|
+
<%= render :partial => 'activities/likes',
|
|
23
|
+
:locals => { :activity => activity } %>
|
|
24
|
+
|
|
22
25
|
<%= render :partial => 'activities/comments',
|
|
23
26
|
:locals => { :activity => activity } %>
|
|
24
27
|
|
|
@@ -77,7 +77,7 @@ $(function(){
|
|
|
77
77
|
$("#sector_editor").data("prepare")(subsector.getCheesecake(),subsector);
|
|
78
78
|
};
|
|
79
79
|
$("#contacts_filter_input").keyup(function(){
|
|
80
|
-
cheese.
|
|
80
|
+
cheese.filter($("#contacts_filter_input").val());
|
|
81
81
|
//TODO: Make users unfiltered visible again
|
|
82
82
|
});
|
|
83
83
|
cheese.onChange = function(cheesecake){
|
|
@@ -1,54 +1,33 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
<li><%= link_to content_tag(:span,t('search.show_all'),:class => params[:focus].blank? ? 'global selected' : 'global'), search_path(:search_query => params[:search_query]), :remote => true %></li>
|
|
11
|
-
<% SocialStream.extended_search_models.each do |model_sym| %>
|
|
12
|
-
<% selected_class = (params[:focus].present? and params[:focus].pluralize.downcase.eql?(model_sym.to_s.pluralize.downcase)) ? 'selected' : ''%>
|
|
13
|
-
<% disabled = ThinkingSphinx.count(get_search_query, :classes => [model_sym.to_s.classify.constantize])==0 %>
|
|
14
|
-
<% disabled_class = (disabled ? 'disabled' : '') %>
|
|
15
|
-
<li>
|
|
16
|
-
<% unless disabled %>
|
|
17
|
-
<%= focus_search_link content_tag(:span, model_sym.to_s.pluralize.capitalize,
|
|
18
|
-
:class => selected_class + " " + disabled_class + " " + model_sym.to_s.pluralize.downcase),
|
|
19
|
-
model_sym.to_s.classify.constantize,
|
|
20
|
-
params[:search_query] %>
|
|
21
|
-
<% else %>
|
|
22
|
-
<%= content_tag(:span, model_sym.to_s.pluralize.capitalize,
|
|
23
|
-
:class => selected_class + " " + disabled_class + " " + model_sym.to_s.pluralize.downcase,
|
|
24
|
-
:title => I18n.t('search.no_subject_found', :subject => model_sym.to_s)) %>
|
|
25
|
-
<% end %>
|
|
26
|
-
</li>
|
|
27
|
-
<% end %>
|
|
28
|
-
</ul>
|
|
29
|
-
</div>
|
|
1
|
+
<%= form_tag search_path, :method => :get,
|
|
2
|
+
:remote => true,
|
|
3
|
+
:id => "search_form" do %>
|
|
4
|
+
<%= hidden_field_tag :focus, params[:focus] %>
|
|
5
|
+
<div class="block">
|
|
6
|
+
<div class="error" id="too_short_error" <%= 'style=display:block;' if too_short_query? %>><%= t('search.at_least') %></div>
|
|
7
|
+
|
|
8
|
+
<div class="form_row search_row">
|
|
9
|
+
<%= text_field_tag :search_query, params[:search_query], :autocomplete => :off, :id => :global_search_input %>
|
|
30
10
|
</div>
|
|
31
|
-
|
|
11
|
+
|
|
12
|
+
<div id="focus_options" class="form_row search_row">
|
|
13
|
+
<ul class="menu_plain_list">
|
|
14
|
+
<li><%= link_to content_tag(:span,
|
|
15
|
+
t('search.show_all'),
|
|
16
|
+
:class => "global #{ params[:focus].blank? && 'selected' }"),
|
|
17
|
+
search_path(:search_query => params[:search_query]),
|
|
18
|
+
:remote => true %></li>
|
|
19
|
+
<% SocialStream.extended_search_models.each do |model_sym| %>
|
|
20
|
+
<li>
|
|
21
|
+
<%= search_tab(model_sym) %>
|
|
22
|
+
</li>
|
|
23
|
+
<% end %>
|
|
24
|
+
</ul>
|
|
25
|
+
</div>
|
|
26
|
+
</div>
|
|
27
|
+
<% end %>
|
|
32
28
|
|
|
33
29
|
<%= javascript_tag do %>
|
|
34
30
|
$(function() {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
$('#search_form').submit(function() {
|
|
38
|
-
query = $('#global_search_input').val();
|
|
39
|
-
if((query=="")||(query.length < 2)||(query=="<%= t('search.write') %>")){
|
|
40
|
-
$('#too_short_error').show();
|
|
41
|
-
$('#global_search_input').removeClass("searching");
|
|
42
|
-
$('#global_search_input').blur();
|
|
43
|
-
$('#global_search_input').focus();
|
|
44
|
-
return false;
|
|
45
|
-
}else{
|
|
46
|
-
$('#global_search_input').addClass("searching");
|
|
47
|
-
$('#global_search_input').blur();
|
|
48
|
-
}
|
|
49
|
-
return true;
|
|
50
|
-
});
|
|
51
|
-
|
|
52
|
-
$("#global_search_input").Watermark("<%= I18n.t('search.write') %>");
|
|
31
|
+
SocialStream.Search.init();
|
|
53
32
|
});
|
|
54
33
|
<% end %>
|
data/config/locales/en.yml
CHANGED
|
@@ -45,6 +45,13 @@ en:
|
|
|
45
45
|
delete: "Delete"
|
|
46
46
|
last: "Last Activities"
|
|
47
47
|
like: "I like"
|
|
48
|
+
like_sentence:
|
|
49
|
+
few:
|
|
50
|
+
one: "%{likers} likes this"
|
|
51
|
+
other: "%{likers} like this"
|
|
52
|
+
many:
|
|
53
|
+
one: "%{likers} and %{count} more person like this"
|
|
54
|
+
other: "%{likers} and %{count} more people like this"
|
|
48
55
|
one: "Activity"
|
|
49
56
|
other: "Activities"
|
|
50
57
|
privacy:
|
|
@@ -111,6 +118,9 @@ en:
|
|
|
111
118
|
confirm_delete: "Delete comment?"
|
|
112
119
|
name: "comment"
|
|
113
120
|
one: "a comment"
|
|
121
|
+
title:
|
|
122
|
+
one: "Comment"
|
|
123
|
+
other: "Comments"
|
|
114
124
|
view_all: "View all comments"
|
|
115
125
|
contact:
|
|
116
126
|
addressbook: "Addressbook"
|
|
@@ -226,6 +236,9 @@ en:
|
|
|
226
236
|
followed: "Most followed"
|
|
227
237
|
liked: "Most liked"
|
|
228
238
|
tags: "Tags"
|
|
239
|
+
title:
|
|
240
|
+
one: "Group"
|
|
241
|
+
other: "Groups"
|
|
229
242
|
help: "Help"
|
|
230
243
|
helpers:
|
|
231
244
|
submit:
|
|
@@ -337,7 +350,9 @@ en:
|
|
|
337
350
|
input: "What are you doing?"
|
|
338
351
|
name: "post"
|
|
339
352
|
one: "a post"
|
|
340
|
-
title:
|
|
353
|
+
title:
|
|
354
|
+
one: "Post"
|
|
355
|
+
other: "Posts"
|
|
341
356
|
preposition:
|
|
342
357
|
and: "and"
|
|
343
358
|
on: "on"
|
|
@@ -496,11 +511,14 @@ en:
|
|
|
496
511
|
ago: "%{time} ago"
|
|
497
512
|
unknown: "Unknown"
|
|
498
513
|
user:
|
|
514
|
+
all: "All users"
|
|
515
|
+
all_n: "All users (%{count})"
|
|
499
516
|
by: "By Users"
|
|
500
517
|
one: "User"
|
|
501
518
|
other: "Users"
|
|
502
|
-
|
|
503
|
-
|
|
519
|
+
title:
|
|
520
|
+
one: "User"
|
|
521
|
+
other: "Users"
|
|
504
522
|
welcome: "Welcome to %{site}!"
|
|
505
523
|
lang:
|
|
506
524
|
browser: "Auto-detect browser language"
|
data/config/locales/es.yml
CHANGED
|
@@ -112,6 +112,9 @@ es:
|
|
|
112
112
|
name: "comentario"
|
|
113
113
|
one: "un comentario"
|
|
114
114
|
view_all: "Ver todos los comentarios"
|
|
115
|
+
title:
|
|
116
|
+
one: "Comentario"
|
|
117
|
+
other: "Comentarios"
|
|
115
118
|
contact:
|
|
116
119
|
addressbook: "Libreta de direcciones"
|
|
117
120
|
all_n: "Todos los contactos (%{count})"
|
|
@@ -226,6 +229,9 @@ es:
|
|
|
226
229
|
followed: "Más seguidos"
|
|
227
230
|
liked: "Más populares"
|
|
228
231
|
tags: "Etiquetas"
|
|
232
|
+
title:
|
|
233
|
+
one: "Grupo"
|
|
234
|
+
other: "Grupos"
|
|
229
235
|
help: "Ayuda"
|
|
230
236
|
helpers:
|
|
231
237
|
submit:
|
|
@@ -337,7 +343,9 @@ es:
|
|
|
337
343
|
input: "¿Qué quieres compartir?"
|
|
338
344
|
name: "publicación"
|
|
339
345
|
one: "una publicación"
|
|
340
|
-
title:
|
|
346
|
+
title:
|
|
347
|
+
one: "Texto"
|
|
348
|
+
other: "Textos"
|
|
341
349
|
preposition:
|
|
342
350
|
and: "y"
|
|
343
351
|
profile:
|
|
@@ -514,11 +522,14 @@ es:
|
|
|
514
522
|
ago: "hace %{time}"
|
|
515
523
|
unknown: "Desconocido"
|
|
516
524
|
user:
|
|
525
|
+
all: "Todos los usuarios"
|
|
526
|
+
all_n: "Todos los usuarios (%{count})"
|
|
517
527
|
by: "Por usuarios"
|
|
518
528
|
one: "Usuario"
|
|
519
529
|
other: "Usuarios"
|
|
520
|
-
|
|
521
|
-
|
|
530
|
+
title:
|
|
531
|
+
one: "Usuario"
|
|
532
|
+
other: "Usuarios"
|
|
522
533
|
welcome: "¡Bienvenid@ a %{site}!"
|
|
523
534
|
lang:
|
|
524
535
|
browser: "Autodetectar el idioma del navegador"
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: social_stream-base
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.16.
|
|
4
|
+
version: 0.16.4
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -10,11 +10,11 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2012-
|
|
13
|
+
date: 2012-03-01 00:00:00.000000000Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: rails
|
|
17
|
-
requirement: &
|
|
17
|
+
requirement: &71125470 !ruby/object:Gem::Requirement
|
|
18
18
|
none: false
|
|
19
19
|
requirements:
|
|
20
20
|
- - ! '>='
|
|
@@ -22,10 +22,10 @@ dependencies:
|
|
|
22
22
|
version: 3.1.0
|
|
23
23
|
type: :runtime
|
|
24
24
|
prerelease: false
|
|
25
|
-
version_requirements: *
|
|
25
|
+
version_requirements: *71125470
|
|
26
26
|
- !ruby/object:Gem::Dependency
|
|
27
27
|
name: ancestry
|
|
28
|
-
requirement: &
|
|
28
|
+
requirement: &71124250 !ruby/object:Gem::Requirement
|
|
29
29
|
none: false
|
|
30
30
|
requirements:
|
|
31
31
|
- - ~>
|
|
@@ -33,10 +33,10 @@ dependencies:
|
|
|
33
33
|
version: 1.2.3
|
|
34
34
|
type: :runtime
|
|
35
35
|
prerelease: false
|
|
36
|
-
version_requirements: *
|
|
36
|
+
version_requirements: *71124250
|
|
37
37
|
- !ruby/object:Gem::Dependency
|
|
38
38
|
name: foreigner
|
|
39
|
-
requirement: &
|
|
39
|
+
requirement: &71122600 !ruby/object:Gem::Requirement
|
|
40
40
|
none: false
|
|
41
41
|
requirements:
|
|
42
42
|
- - ~>
|
|
@@ -44,10 +44,10 @@ dependencies:
|
|
|
44
44
|
version: 1.1.1
|
|
45
45
|
type: :runtime
|
|
46
46
|
prerelease: false
|
|
47
|
-
version_requirements: *
|
|
47
|
+
version_requirements: *71122600
|
|
48
48
|
- !ruby/object:Gem::Dependency
|
|
49
49
|
name: devise
|
|
50
|
-
requirement: &
|
|
50
|
+
requirement: &71119970 !ruby/object:Gem::Requirement
|
|
51
51
|
none: false
|
|
52
52
|
requirements:
|
|
53
53
|
- - ~>
|
|
@@ -55,10 +55,10 @@ dependencies:
|
|
|
55
55
|
version: 1.5.3
|
|
56
56
|
type: :runtime
|
|
57
57
|
prerelease: false
|
|
58
|
-
version_requirements: *
|
|
58
|
+
version_requirements: *71119970
|
|
59
59
|
- !ruby/object:Gem::Dependency
|
|
60
60
|
name: inherited_resources
|
|
61
|
-
requirement: &
|
|
61
|
+
requirement: &71118640 !ruby/object:Gem::Requirement
|
|
62
62
|
none: false
|
|
63
63
|
requirements:
|
|
64
64
|
- - ~>
|
|
@@ -66,10 +66,10 @@ dependencies:
|
|
|
66
66
|
version: 1.3.0
|
|
67
67
|
type: :runtime
|
|
68
68
|
prerelease: false
|
|
69
|
-
version_requirements: *
|
|
69
|
+
version_requirements: *71118640
|
|
70
70
|
- !ruby/object:Gem::Dependency
|
|
71
71
|
name: stringex
|
|
72
|
-
requirement: &
|
|
72
|
+
requirement: &71116250 !ruby/object:Gem::Requirement
|
|
73
73
|
none: false
|
|
74
74
|
requirements:
|
|
75
75
|
- - ~>
|
|
@@ -77,10 +77,10 @@ dependencies:
|
|
|
77
77
|
version: 1.3.0
|
|
78
78
|
type: :runtime
|
|
79
79
|
prerelease: false
|
|
80
|
-
version_requirements: *
|
|
80
|
+
version_requirements: *71116250
|
|
81
81
|
- !ruby/object:Gem::Dependency
|
|
82
82
|
name: avatars_for_rails
|
|
83
|
-
requirement: &
|
|
83
|
+
requirement: &71111270 !ruby/object:Gem::Requirement
|
|
84
84
|
none: false
|
|
85
85
|
requirements:
|
|
86
86
|
- - ~>
|
|
@@ -88,10 +88,10 @@ dependencies:
|
|
|
88
88
|
version: 0.2.2
|
|
89
89
|
type: :runtime
|
|
90
90
|
prerelease: false
|
|
91
|
-
version_requirements: *
|
|
91
|
+
version_requirements: *71111270
|
|
92
92
|
- !ruby/object:Gem::Dependency
|
|
93
93
|
name: jquery-rails
|
|
94
|
-
requirement: &
|
|
94
|
+
requirement: &71110400 !ruby/object:Gem::Requirement
|
|
95
95
|
none: false
|
|
96
96
|
requirements:
|
|
97
97
|
- - ! '>='
|
|
@@ -99,10 +99,10 @@ dependencies:
|
|
|
99
99
|
version: 1.0.9
|
|
100
100
|
type: :runtime
|
|
101
101
|
prerelease: false
|
|
102
|
-
version_requirements: *
|
|
102
|
+
version_requirements: *71110400
|
|
103
103
|
- !ruby/object:Gem::Dependency
|
|
104
104
|
name: cancan
|
|
105
|
-
requirement: &
|
|
105
|
+
requirement: &71109030 !ruby/object:Gem::Requirement
|
|
106
106
|
none: false
|
|
107
107
|
requirements:
|
|
108
108
|
- - ~>
|
|
@@ -110,10 +110,10 @@ dependencies:
|
|
|
110
110
|
version: 1.6.4
|
|
111
111
|
type: :runtime
|
|
112
112
|
prerelease: false
|
|
113
|
-
version_requirements: *
|
|
113
|
+
version_requirements: *71109030
|
|
114
114
|
- !ruby/object:Gem::Dependency
|
|
115
115
|
name: kaminari
|
|
116
|
-
requirement: &
|
|
116
|
+
requirement: &71102380 !ruby/object:Gem::Requirement
|
|
117
117
|
none: false
|
|
118
118
|
requirements:
|
|
119
119
|
- - ~>
|
|
@@ -121,10 +121,10 @@ dependencies:
|
|
|
121
121
|
version: 0.13.0
|
|
122
122
|
type: :runtime
|
|
123
123
|
prerelease: false
|
|
124
|
-
version_requirements: *
|
|
124
|
+
version_requirements: *71102380
|
|
125
125
|
- !ruby/object:Gem::Dependency
|
|
126
126
|
name: omniauth
|
|
127
|
-
requirement: &
|
|
127
|
+
requirement: &71099110 !ruby/object:Gem::Requirement
|
|
128
128
|
none: false
|
|
129
129
|
requirements:
|
|
130
130
|
- - ~>
|
|
@@ -132,10 +132,10 @@ dependencies:
|
|
|
132
132
|
version: 1.0.2
|
|
133
133
|
type: :runtime
|
|
134
134
|
prerelease: false
|
|
135
|
-
version_requirements: *
|
|
135
|
+
version_requirements: *71099110
|
|
136
136
|
- !ruby/object:Gem::Dependency
|
|
137
137
|
name: omniauth-facebook
|
|
138
|
-
requirement: &
|
|
138
|
+
requirement: &71097850 !ruby/object:Gem::Requirement
|
|
139
139
|
none: false
|
|
140
140
|
requirements:
|
|
141
141
|
- - ~>
|
|
@@ -143,10 +143,10 @@ dependencies:
|
|
|
143
143
|
version: 1.2.0
|
|
144
144
|
type: :runtime
|
|
145
145
|
prerelease: false
|
|
146
|
-
version_requirements: *
|
|
146
|
+
version_requirements: *71097850
|
|
147
147
|
- !ruby/object:Gem::Dependency
|
|
148
148
|
name: omniauth-linkedin
|
|
149
|
-
requirement: &
|
|
149
|
+
requirement: &71075910 !ruby/object:Gem::Requirement
|
|
150
150
|
none: false
|
|
151
151
|
requirements:
|
|
152
152
|
- - ~>
|
|
@@ -154,10 +154,10 @@ dependencies:
|
|
|
154
154
|
version: 0.0.6
|
|
155
155
|
type: :runtime
|
|
156
156
|
prerelease: false
|
|
157
|
-
version_requirements: *
|
|
157
|
+
version_requirements: *71075910
|
|
158
158
|
- !ruby/object:Gem::Dependency
|
|
159
159
|
name: mailboxer
|
|
160
|
-
requirement: &
|
|
160
|
+
requirement: &70750160 !ruby/object:Gem::Requirement
|
|
161
161
|
none: false
|
|
162
162
|
requirements:
|
|
163
163
|
- - ~>
|
|
@@ -165,10 +165,10 @@ dependencies:
|
|
|
165
165
|
version: 0.6.0
|
|
166
166
|
type: :runtime
|
|
167
167
|
prerelease: false
|
|
168
|
-
version_requirements: *
|
|
168
|
+
version_requirements: *70750160
|
|
169
169
|
- !ruby/object:Gem::Dependency
|
|
170
170
|
name: acts-as-taggable-on
|
|
171
|
-
requirement: &
|
|
171
|
+
requirement: &70749520 !ruby/object:Gem::Requirement
|
|
172
172
|
none: false
|
|
173
173
|
requirements:
|
|
174
174
|
- - ~>
|
|
@@ -176,10 +176,10 @@ dependencies:
|
|
|
176
176
|
version: 2.2.2
|
|
177
177
|
type: :runtime
|
|
178
178
|
prerelease: false
|
|
179
|
-
version_requirements: *
|
|
179
|
+
version_requirements: *70749520
|
|
180
180
|
- !ruby/object:Gem::Dependency
|
|
181
181
|
name: formtastic
|
|
182
|
-
requirement: &
|
|
182
|
+
requirement: &70748700 !ruby/object:Gem::Requirement
|
|
183
183
|
none: false
|
|
184
184
|
requirements:
|
|
185
185
|
- - ~>
|
|
@@ -187,10 +187,10 @@ dependencies:
|
|
|
187
187
|
version: 1.2.3
|
|
188
188
|
type: :runtime
|
|
189
189
|
prerelease: false
|
|
190
|
-
version_requirements: *
|
|
190
|
+
version_requirements: *70748700
|
|
191
191
|
- !ruby/object:Gem::Dependency
|
|
192
192
|
name: simple-navigation
|
|
193
|
-
requirement: &
|
|
193
|
+
requirement: &70748130 !ruby/object:Gem::Requirement
|
|
194
194
|
none: false
|
|
195
195
|
requirements:
|
|
196
196
|
- - ~>
|
|
@@ -198,10 +198,10 @@ dependencies:
|
|
|
198
198
|
version: 3.5.1
|
|
199
199
|
type: :runtime
|
|
200
200
|
prerelease: false
|
|
201
|
-
version_requirements: *
|
|
201
|
+
version_requirements: *70748130
|
|
202
202
|
- !ruby/object:Gem::Dependency
|
|
203
203
|
name: resque
|
|
204
|
-
requirement: &
|
|
204
|
+
requirement: &70747860 !ruby/object:Gem::Requirement
|
|
205
205
|
none: false
|
|
206
206
|
requirements:
|
|
207
207
|
- - ~>
|
|
@@ -209,10 +209,10 @@ dependencies:
|
|
|
209
209
|
version: 1.19.0
|
|
210
210
|
type: :runtime
|
|
211
211
|
prerelease: false
|
|
212
|
-
version_requirements: *
|
|
212
|
+
version_requirements: *70747860
|
|
213
213
|
- !ruby/object:Gem::Dependency
|
|
214
214
|
name: modernizr-rails
|
|
215
|
-
requirement: &
|
|
215
|
+
requirement: &70747470 !ruby/object:Gem::Requirement
|
|
216
216
|
none: false
|
|
217
217
|
requirements:
|
|
218
218
|
- - ~>
|
|
@@ -220,10 +220,10 @@ dependencies:
|
|
|
220
220
|
version: 2.0.6
|
|
221
221
|
type: :runtime
|
|
222
222
|
prerelease: false
|
|
223
|
-
version_requirements: *
|
|
223
|
+
version_requirements: *70747470
|
|
224
224
|
- !ruby/object:Gem::Dependency
|
|
225
225
|
name: thinking-sphinx
|
|
226
|
-
requirement: &
|
|
226
|
+
requirement: &70746790 !ruby/object:Gem::Requirement
|
|
227
227
|
none: false
|
|
228
228
|
requirements:
|
|
229
229
|
- - ~>
|
|
@@ -231,10 +231,10 @@ dependencies:
|
|
|
231
231
|
version: 2.0.8
|
|
232
232
|
type: :runtime
|
|
233
233
|
prerelease: false
|
|
234
|
-
version_requirements: *
|
|
234
|
+
version_requirements: *70746790
|
|
235
235
|
- !ruby/object:Gem::Dependency
|
|
236
236
|
name: sass-rails
|
|
237
|
-
requirement: &
|
|
237
|
+
requirement: &70746000 !ruby/object:Gem::Requirement
|
|
238
238
|
none: false
|
|
239
239
|
requirements:
|
|
240
240
|
- - ! '>='
|
|
@@ -242,10 +242,10 @@ dependencies:
|
|
|
242
242
|
version: 3.1.0
|
|
243
243
|
type: :runtime
|
|
244
244
|
prerelease: false
|
|
245
|
-
version_requirements: *
|
|
245
|
+
version_requirements: *70746000
|
|
246
246
|
- !ruby/object:Gem::Dependency
|
|
247
247
|
name: rails_autolink
|
|
248
|
-
requirement: &
|
|
248
|
+
requirement: &70745640 !ruby/object:Gem::Requirement
|
|
249
249
|
none: false
|
|
250
250
|
requirements:
|
|
251
251
|
- - ~>
|
|
@@ -253,10 +253,10 @@ dependencies:
|
|
|
253
253
|
version: 1.0.4
|
|
254
254
|
type: :runtime
|
|
255
255
|
prerelease: false
|
|
256
|
-
version_requirements: *
|
|
256
|
+
version_requirements: *70745640
|
|
257
257
|
- !ruby/object:Gem::Dependency
|
|
258
258
|
name: social_cheesecake
|
|
259
|
-
requirement: &
|
|
259
|
+
requirement: &70745040 !ruby/object:Gem::Requirement
|
|
260
260
|
none: false
|
|
261
261
|
requirements:
|
|
262
262
|
- - ~>
|
|
@@ -264,10 +264,10 @@ dependencies:
|
|
|
264
264
|
version: 0.4.0
|
|
265
265
|
type: :runtime
|
|
266
266
|
prerelease: false
|
|
267
|
-
version_requirements: *
|
|
267
|
+
version_requirements: *70745040
|
|
268
268
|
- !ruby/object:Gem::Dependency
|
|
269
269
|
name: i18n-js
|
|
270
|
-
requirement: &
|
|
270
|
+
requirement: &70744670 !ruby/object:Gem::Requirement
|
|
271
271
|
none: false
|
|
272
272
|
requirements:
|
|
273
273
|
- - ~>
|
|
@@ -275,10 +275,10 @@ dependencies:
|
|
|
275
275
|
version: 2.1.2
|
|
276
276
|
type: :runtime
|
|
277
277
|
prerelease: false
|
|
278
|
-
version_requirements: *
|
|
278
|
+
version_requirements: *70744670
|
|
279
279
|
- !ruby/object:Gem::Dependency
|
|
280
280
|
name: capybara
|
|
281
|
-
requirement: &
|
|
281
|
+
requirement: &70744240 !ruby/object:Gem::Requirement
|
|
282
282
|
none: false
|
|
283
283
|
requirements:
|
|
284
284
|
- - ~>
|
|
@@ -286,10 +286,10 @@ dependencies:
|
|
|
286
286
|
version: 0.3.9
|
|
287
287
|
type: :development
|
|
288
288
|
prerelease: false
|
|
289
|
-
version_requirements: *
|
|
289
|
+
version_requirements: *70744240
|
|
290
290
|
- !ruby/object:Gem::Dependency
|
|
291
291
|
name: sqlite3-ruby
|
|
292
|
-
requirement: &
|
|
292
|
+
requirement: &70743760 !ruby/object:Gem::Requirement
|
|
293
293
|
none: false
|
|
294
294
|
requirements:
|
|
295
295
|
- - ! '>='
|
|
@@ -297,10 +297,10 @@ dependencies:
|
|
|
297
297
|
version: '0'
|
|
298
298
|
type: :development
|
|
299
299
|
prerelease: false
|
|
300
|
-
version_requirements: *
|
|
300
|
+
version_requirements: *70743760
|
|
301
301
|
- !ruby/object:Gem::Dependency
|
|
302
302
|
name: ruby-debug19
|
|
303
|
-
requirement: &
|
|
303
|
+
requirement: &70738530 !ruby/object:Gem::Requirement
|
|
304
304
|
none: false
|
|
305
305
|
requirements:
|
|
306
306
|
- - ! '>='
|
|
@@ -308,10 +308,10 @@ dependencies:
|
|
|
308
308
|
version: '0'
|
|
309
309
|
type: :development
|
|
310
310
|
prerelease: false
|
|
311
|
-
version_requirements: *
|
|
311
|
+
version_requirements: *70738530
|
|
312
312
|
- !ruby/object:Gem::Dependency
|
|
313
313
|
name: rspec-rails
|
|
314
|
-
requirement: &
|
|
314
|
+
requirement: &70737640 !ruby/object:Gem::Requirement
|
|
315
315
|
none: false
|
|
316
316
|
requirements:
|
|
317
317
|
- - ~>
|
|
@@ -319,10 +319,10 @@ dependencies:
|
|
|
319
319
|
version: 2.6.1
|
|
320
320
|
type: :development
|
|
321
321
|
prerelease: false
|
|
322
|
-
version_requirements: *
|
|
322
|
+
version_requirements: *70737640
|
|
323
323
|
- !ruby/object:Gem::Dependency
|
|
324
324
|
name: factory_girl
|
|
325
|
-
requirement: &
|
|
325
|
+
requirement: &70736740 !ruby/object:Gem::Requirement
|
|
326
326
|
none: false
|
|
327
327
|
requirements:
|
|
328
328
|
- - ~>
|
|
@@ -330,10 +330,10 @@ dependencies:
|
|
|
330
330
|
version: 1.3.2
|
|
331
331
|
type: :development
|
|
332
332
|
prerelease: false
|
|
333
|
-
version_requirements: *
|
|
333
|
+
version_requirements: *70736740
|
|
334
334
|
- !ruby/object:Gem::Dependency
|
|
335
335
|
name: forgery
|
|
336
|
-
requirement: &
|
|
336
|
+
requirement: &70736020 !ruby/object:Gem::Requirement
|
|
337
337
|
none: false
|
|
338
338
|
requirements:
|
|
339
339
|
- - ~>
|
|
@@ -341,10 +341,10 @@ dependencies:
|
|
|
341
341
|
version: 0.4.2
|
|
342
342
|
type: :development
|
|
343
343
|
prerelease: false
|
|
344
|
-
version_requirements: *
|
|
344
|
+
version_requirements: *70736020
|
|
345
345
|
- !ruby/object:Gem::Dependency
|
|
346
346
|
name: ci_reporter
|
|
347
|
-
requirement: &
|
|
347
|
+
requirement: &70734640 !ruby/object:Gem::Requirement
|
|
348
348
|
none: false
|
|
349
349
|
requirements:
|
|
350
350
|
- - ~>
|
|
@@ -352,10 +352,10 @@ dependencies:
|
|
|
352
352
|
version: 1.6.4
|
|
353
353
|
type: :development
|
|
354
354
|
prerelease: false
|
|
355
|
-
version_requirements: *
|
|
355
|
+
version_requirements: *70734640
|
|
356
356
|
- !ruby/object:Gem::Dependency
|
|
357
357
|
name: nifty-generators
|
|
358
|
-
requirement: &
|
|
358
|
+
requirement: &70734120 !ruby/object:Gem::Requirement
|
|
359
359
|
none: false
|
|
360
360
|
requirements:
|
|
361
361
|
- - ~>
|
|
@@ -363,7 +363,7 @@ dependencies:
|
|
|
363
363
|
version: 0.4.5
|
|
364
364
|
type: :development
|
|
365
365
|
prerelease: false
|
|
366
|
-
version_requirements: *
|
|
366
|
+
version_requirements: *70734120
|
|
367
367
|
description: ! 'Social Stream is a Ruby on Rails engine providing your application
|
|
368
368
|
with social networking features and activity streams.
|
|
369
369
|
|
|
@@ -555,6 +555,7 @@ files:
|
|
|
555
555
|
- app/assets/javascripts/search.js.erb
|
|
556
556
|
- app/assets/javascripts/settings.js
|
|
557
557
|
- app/assets/javascripts/social_stream-base.js
|
|
558
|
+
- app/assets/javascripts/social_stream.search.js.erb
|
|
558
559
|
- app/assets/javascripts/social_stream.timeline.js
|
|
559
560
|
- app/assets/javascripts/social_stream.wall.js.erb
|
|
560
561
|
- app/assets/javascripts/ties.js
|
|
@@ -667,6 +668,7 @@ files:
|
|
|
667
668
|
- app/views/activities/_child.html.erb
|
|
668
669
|
- app/views/activities/_comments.html.erb
|
|
669
670
|
- app/views/activities/_index.html.erb
|
|
671
|
+
- app/views/activities/_likes.html.erb
|
|
670
672
|
- app/views/activities/_new.html.erb
|
|
671
673
|
- app/views/activities/_options.html.erb
|
|
672
674
|
- app/views/activities/_root.html.erb
|