social_stream-base 0.15.0 → 0.15.1
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/images/btn/cheese_close_edit.png +0 -0
- data/app/assets/images/btn/cheese_edit.png +0 -0
- data/app/assets/stylesheets/cheesecake.css.scss +55 -1
- data/app/models/contact.rb +1 -0
- data/app/views/cheesecake/_cheesecake.html.erb +14 -16
- data/app/views/cheesecake/_index.html.erb +25 -2
- data/app/views/cheesecake/_sector_form.html.erb +81 -1
- data/lib/social_stream/base/version.rb +1 -1
- data/spec/models/contact_spec.rb +11 -0
- metadata +67 -65
|
Binary file
|
|
Binary file
|
|
@@ -5,6 +5,17 @@
|
|
|
5
5
|
padding: 20px;
|
|
6
6
|
padding-top: 0px;
|
|
7
7
|
}
|
|
8
|
+
#edit_sector_button {
|
|
9
|
+
position: absolute;
|
|
10
|
+
top: 75px;
|
|
11
|
+
left: 410px;
|
|
12
|
+
display: none;
|
|
13
|
+
z-index: 3000;
|
|
14
|
+
}
|
|
15
|
+
#edit_sector_button img {
|
|
16
|
+
width: 24px;
|
|
17
|
+
height: 24px;
|
|
18
|
+
}
|
|
8
19
|
#contacts_cheesecake {
|
|
9
20
|
width: 440px;
|
|
10
21
|
height: 440px;
|
|
@@ -13,7 +24,7 @@
|
|
|
13
24
|
float: left;
|
|
14
25
|
position: relative;
|
|
15
26
|
}
|
|
16
|
-
#
|
|
27
|
+
#sector_editor {
|
|
17
28
|
float: left;
|
|
18
29
|
position: relative;
|
|
19
30
|
width: 0px;
|
|
@@ -257,3 +268,46 @@
|
|
|
257
268
|
.cheesecake_actor_tipsy.tipsy .logo {
|
|
258
269
|
display: none;
|
|
259
270
|
}
|
|
271
|
+
#sector_form {
|
|
272
|
+
width: 300px;
|
|
273
|
+
height: 450px;
|
|
274
|
+
float: right;
|
|
275
|
+
}
|
|
276
|
+
#sector_form .title {
|
|
277
|
+
width: 300px;
|
|
278
|
+
text-align: center;
|
|
279
|
+
font-size: 13px;
|
|
280
|
+
padding: 20px 0px 15px 0px;
|
|
281
|
+
}
|
|
282
|
+
#sector_form .title #edited_sector_name {
|
|
283
|
+
font-size: 14px;
|
|
284
|
+
font-weight: bold;
|
|
285
|
+
}
|
|
286
|
+
#sector_form #edited_sector_color_out {
|
|
287
|
+
border: 1px solid $main-color;
|
|
288
|
+
background: $header-notification-color;
|
|
289
|
+
width: 14px;
|
|
290
|
+
height: 14px;
|
|
291
|
+
padding: 3px;
|
|
292
|
+
}
|
|
293
|
+
#sector_form #edited_sector_color_in {
|
|
294
|
+
background: $secondary-color;
|
|
295
|
+
width: 14px;
|
|
296
|
+
height: 14px;
|
|
297
|
+
}
|
|
298
|
+
#sector_form .subsector {
|
|
299
|
+
border: 1px solid $input-border-color;
|
|
300
|
+
background: $fill-color;
|
|
301
|
+
width: 260px;
|
|
302
|
+
min-height: 20px;
|
|
303
|
+
}
|
|
304
|
+
#sector_form .subsector .title {
|
|
305
|
+
width: 260px;
|
|
306
|
+
text-align: center;
|
|
307
|
+
font-size: 11px;
|
|
308
|
+
padding: 5px 0px 5px 0px;
|
|
309
|
+
}
|
|
310
|
+
#sector_form .subsector .title .edited_subsector_name {
|
|
311
|
+
font-size: 11px;
|
|
312
|
+
font-weight: bold;
|
|
313
|
+
}
|
data/app/models/contact.rb
CHANGED
|
@@ -50,6 +50,7 @@ class Contact < ActiveRecord::Base
|
|
|
50
50
|
scope :not_reflexive, where(arel_table[:sender_id].not_eq(arel_table[:receiver_id]))
|
|
51
51
|
|
|
52
52
|
scope :pending, active.
|
|
53
|
+
positive.
|
|
53
54
|
not_reflexive.
|
|
54
55
|
joins("LEFT JOIN contacts AS inverse_contacts ON inverse_contacts.id = contacts.inverse_id").
|
|
55
56
|
where(arel_table[:inverse_id].eq(nil).or(arel_table.alias("inverse_contacts")[:ties_count].eq(0)))
|
|
@@ -37,41 +37,39 @@ $(function(){
|
|
|
37
37
|
var cheese = new socialCheesecake.Cheesecake(cheesecakeData);
|
|
38
38
|
cheese.syncSectorFocusCallbacks = false;
|
|
39
39
|
cheese.onSectorFocusBegin = function(cheesecake,callback){
|
|
40
|
-
if(cheese.highlightedSector.auxiliar){
|
|
40
|
+
if((cheese.highlightedSector)&&(cheese.highlightedSector.auxiliar)){
|
|
41
41
|
$("#contacts_explorer").animate({width: 0},500,function(){
|
|
42
42
|
$("#contacts_explorer").hide();
|
|
43
43
|
});
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
$("#sector_form").animate({width: 300},500);
|
|
47
|
-
},100);
|
|
44
|
+
$("#sector_editor").show();
|
|
45
|
+
$("#sector_editor").animate({width: 300},500);
|
|
48
46
|
}else{
|
|
49
47
|
$("#contacts_grid_available").fadeOut("fast", callback);
|
|
50
48
|
}
|
|
51
49
|
};
|
|
52
50
|
cheese.onSectorFocusEnd = function(cheesecake){
|
|
53
|
-
if(cheese.highlightedSector.auxiliar){
|
|
51
|
+
if((cheese.highlightedSector)&&(cheese.highlightedSector.auxiliar)){
|
|
54
52
|
|
|
55
53
|
}else{
|
|
56
|
-
$("#contacts_grid_available").fadeIn("fast");
|
|
54
|
+
$("#contacts_grid_available").fadeIn("fast");
|
|
55
|
+
$("#edit_sector_button").fadeIn("fast");
|
|
57
56
|
}
|
|
58
57
|
};
|
|
59
58
|
cheese.onSectorUnfocusBegin = function(cheesecake,callback){
|
|
60
|
-
if(cheese.highlightedSector.auxiliar){
|
|
59
|
+
if((cheese.highlightedSector)&&(cheese.highlightedSector.auxiliar)){
|
|
61
60
|
|
|
62
61
|
}else{
|
|
63
|
-
$("#contacts_grid_available").fadeOut("fast", callback);
|
|
62
|
+
$("#contacts_grid_available").fadeOut("fast", callback);
|
|
63
|
+
$("#edit_sector_button").fadeOut("fast");
|
|
64
64
|
}
|
|
65
65
|
};
|
|
66
66
|
cheese.onSectorUnfocusEnd = function(cheesecake){
|
|
67
|
-
if(cheese.highlightedSector.auxiliar){
|
|
68
|
-
$("#
|
|
69
|
-
$("#
|
|
67
|
+
if((cheese.highlightedSector)&&(cheese.highlightedSector.auxiliar)){
|
|
68
|
+
$("#sector_editor").animate({width: 0},500,function(){
|
|
69
|
+
$("#sector_editor").hide();
|
|
70
70
|
});
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
$("#contacts_explorer").animate({width: 300},500);
|
|
74
|
-
},100);
|
|
71
|
+
$("#contacts_explorer").show();
|
|
72
|
+
$("#contacts_explorer").animate({width: 300},500);
|
|
75
73
|
}else{
|
|
76
74
|
$("#contacts_grid_available").fadeIn("fast");
|
|
77
75
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
<div id="edit_sector_button"><%= image_tag "btn/cheese_edit.png" %></div>
|
|
2
2
|
<div id="contacts_cheesecake"></div>
|
|
3
|
-
<div id="
|
|
3
|
+
<div id="sector_editor">
|
|
4
4
|
<%= render :partial => "sector_form" %>
|
|
5
5
|
</div>
|
|
6
6
|
<div id="contacts_explorer">
|
|
@@ -108,5 +108,28 @@
|
|
|
108
108
|
});
|
|
109
109
|
}
|
|
110
110
|
});
|
|
111
|
+
var edit_sector_click = function(){
|
|
112
|
+
$("#edit_sector_button").off("click.edit");
|
|
113
|
+
$("#edit_sector_button").fadeOut("fast",function(){
|
|
114
|
+
$("#edit_sector_button").html("<%= escape_javascript image_tag "btn/cheese_close_edit.png" %>");
|
|
115
|
+
$("#edit_sector_button").fadeIn("fast");
|
|
116
|
+
});
|
|
117
|
+
$("#contacts_explorer").stop().animate({width: 0},500);
|
|
118
|
+
$("#sector_editor").stop().animate({width: 300},500, function(){
|
|
119
|
+
$("#edit_sector_button").on("click.close_edit",close_edit_sector_click);
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
var close_edit_sector_click = function(){
|
|
123
|
+
$("#edit_sector_button").off("click.close_edit");
|
|
124
|
+
$("#edit_sector_button").fadeOut("fast",function(){
|
|
125
|
+
$("#edit_sector_button").html("<%= escape_javascript image_tag "btn/cheese_edit.png" %>");
|
|
126
|
+
$("#edit_sector_button").fadeIn("fast");
|
|
127
|
+
});
|
|
128
|
+
$("#sector_editor").stop().animate({width: 0},500);
|
|
129
|
+
$("#contacts_explorer").stop().animate({width: 300},500,function(){
|
|
130
|
+
$("#edit_sector_button").on("click.edit",edit_sector_click);
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
$("#edit_sector_button").on("click.edit",edit_sector_click);
|
|
111
134
|
<%= render :partial => 'cheesecake' %>
|
|
112
135
|
<% end %>
|
|
@@ -1 +1,81 @@
|
|
|
1
|
-
|
|
1
|
+
<form id="sector_form">
|
|
2
|
+
<div class="title">
|
|
3
|
+
Editing <span id="edited_sector_name">New sector</span>
|
|
4
|
+
</div>
|
|
5
|
+
<div class="block">
|
|
6
|
+
<div class="form_row">
|
|
7
|
+
<div class="form_label">
|
|
8
|
+
Name:
|
|
9
|
+
</div>
|
|
10
|
+
<div class="form_field">
|
|
11
|
+
<input type="text" class="form_tag" value="New sector">
|
|
12
|
+
</div>
|
|
13
|
+
</div>
|
|
14
|
+
<div class="form_row">
|
|
15
|
+
<div class="form_label">
|
|
16
|
+
Color:
|
|
17
|
+
</div>
|
|
18
|
+
<div class="form_field">
|
|
19
|
+
<div id="edited_sector_color_out">
|
|
20
|
+
<div id="edited_sector_color_in"></div>
|
|
21
|
+
</div>
|
|
22
|
+
</div>
|
|
23
|
+
</div>
|
|
24
|
+
<% for i in 1..4 do %>
|
|
25
|
+
<div class="form_row">
|
|
26
|
+
<div class="subsector">
|
|
27
|
+
<div class="title">
|
|
28
|
+
Subsector <span class="edited_subsector_name">New subsector <%= i %></span>
|
|
29
|
+
</div>
|
|
30
|
+
<div class="content" <%= i==1 ? '' : 'style=display:none;' %>>
|
|
31
|
+
<div class="form_row">
|
|
32
|
+
<div class="form_label">
|
|
33
|
+
Name:
|
|
34
|
+
</div>
|
|
35
|
+
<div class="form_field">
|
|
36
|
+
<input type="text" class="form_tag" value="New subsector <%= i %>">
|
|
37
|
+
</div>
|
|
38
|
+
</div>
|
|
39
|
+
<div class="form_row">
|
|
40
|
+
<div class="form_label">
|
|
41
|
+
Permissions:
|
|
42
|
+
</div>
|
|
43
|
+
</div>
|
|
44
|
+
<div class="form_row">
|
|
45
|
+
<div class="form_field">
|
|
46
|
+
<table class="tableCheckBoxOptions">
|
|
47
|
+
<% default_permissions.each_with_index do |p, i| %>
|
|
48
|
+
<tr>
|
|
49
|
+
<td>
|
|
50
|
+
<div contain=<%= dom_id p %> class="checkboxPermissionOptionLeft">
|
|
51
|
+
<input id=<%= dom_id p %> class="permission" type="checkbox"/>
|
|
52
|
+
<label for=<%= dom_id p %>><%= p.description(:brief) %></label>
|
|
53
|
+
<div class="clearfloat"></div>
|
|
54
|
+
</div></td>
|
|
55
|
+
</tr>
|
|
56
|
+
<% end %>
|
|
57
|
+
</table>
|
|
58
|
+
</div>
|
|
59
|
+
</div>
|
|
60
|
+
</div>
|
|
61
|
+
</div>
|
|
62
|
+
</div>
|
|
63
|
+
<% end %>
|
|
64
|
+
</div>
|
|
65
|
+
</form>
|
|
66
|
+
|
|
67
|
+
<%= javascript_tag do %>
|
|
68
|
+
$(function(){
|
|
69
|
+
$(".subsector .title").off("click.toggle");
|
|
70
|
+
$(".subsector .title").on("click.toggle",function(){
|
|
71
|
+
if(!$(this).parent().find(".content").is(':visible')){
|
|
72
|
+
$(".subsector .content").each(function(){
|
|
73
|
+
if($(this).parent().find(".content").is(':visible')){
|
|
74
|
+
$(this).slideToggle();
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
$(this).parent().find(".content").slideToggle();
|
|
78
|
+
}
|
|
79
|
+
})
|
|
80
|
+
});
|
|
81
|
+
<% end %>
|
data/spec/models/contact_spec.rb
CHANGED
|
@@ -35,6 +35,17 @@ describe Contact do
|
|
|
35
35
|
end
|
|
36
36
|
end
|
|
37
37
|
|
|
38
|
+
context "reject" do
|
|
39
|
+
before do
|
|
40
|
+
@contact = Factory(:reject).contact
|
|
41
|
+
@contact.inverse!
|
|
42
|
+
end
|
|
43
|
+
|
|
44
|
+
it "should not appear as pending" do
|
|
45
|
+
@contact.receiver.pending_contacts.should_not include(@contact.inverse!)
|
|
46
|
+
end
|
|
47
|
+
end
|
|
48
|
+
|
|
38
49
|
context "a pair" do
|
|
39
50
|
before do
|
|
40
51
|
@friend = Factory(:friend)
|
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.15.
|
|
4
|
+
version: 0.15.1
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -14,7 +14,7 @@ date: 2012-02-06 00:00:00.000000000Z
|
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: rails
|
|
17
|
-
requirement: &
|
|
17
|
+
requirement: &72328120 !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: *72328120
|
|
26
26
|
- !ruby/object:Gem::Dependency
|
|
27
27
|
name: ancestry
|
|
28
|
-
requirement: &
|
|
28
|
+
requirement: &72327870 !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: *72327870
|
|
37
37
|
- !ruby/object:Gem::Dependency
|
|
38
38
|
name: foreigner
|
|
39
|
-
requirement: &
|
|
39
|
+
requirement: &72327640 !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: *72327640
|
|
48
48
|
- !ruby/object:Gem::Dependency
|
|
49
49
|
name: devise
|
|
50
|
-
requirement: &
|
|
50
|
+
requirement: &72327410 !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: *72327410
|
|
59
59
|
- !ruby/object:Gem::Dependency
|
|
60
60
|
name: inherited_resources
|
|
61
|
-
requirement: &
|
|
61
|
+
requirement: &72327180 !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: *72327180
|
|
70
70
|
- !ruby/object:Gem::Dependency
|
|
71
71
|
name: stringex
|
|
72
|
-
requirement: &
|
|
72
|
+
requirement: &72326950 !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: *72326950
|
|
81
81
|
- !ruby/object:Gem::Dependency
|
|
82
82
|
name: avatars_for_rails
|
|
83
|
-
requirement: &
|
|
83
|
+
requirement: &72326720 !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: *72326720
|
|
92
92
|
- !ruby/object:Gem::Dependency
|
|
93
93
|
name: jquery-rails
|
|
94
|
-
requirement: &
|
|
94
|
+
requirement: &72326490 !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: *72326490
|
|
103
103
|
- !ruby/object:Gem::Dependency
|
|
104
104
|
name: cancan
|
|
105
|
-
requirement: &
|
|
105
|
+
requirement: &72326260 !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: *72326260
|
|
114
114
|
- !ruby/object:Gem::Dependency
|
|
115
115
|
name: kaminari
|
|
116
|
-
requirement: &
|
|
116
|
+
requirement: &72326020 !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: *72326020
|
|
125
125
|
- !ruby/object:Gem::Dependency
|
|
126
126
|
name: omniauth
|
|
127
|
-
requirement: &
|
|
127
|
+
requirement: &72325770 !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: *72325770
|
|
136
136
|
- !ruby/object:Gem::Dependency
|
|
137
137
|
name: omniauth-facebook
|
|
138
|
-
requirement: &
|
|
138
|
+
requirement: &72325470 !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: *72325470
|
|
147
147
|
- !ruby/object:Gem::Dependency
|
|
148
148
|
name: omniauth-linkedin
|
|
149
|
-
requirement: &
|
|
149
|
+
requirement: &72325210 !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: *72325210
|
|
158
158
|
- !ruby/object:Gem::Dependency
|
|
159
159
|
name: mailboxer
|
|
160
|
-
requirement: &
|
|
160
|
+
requirement: &72324860 !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: *72324860
|
|
169
169
|
- !ruby/object:Gem::Dependency
|
|
170
170
|
name: acts-as-taggable-on
|
|
171
|
-
requirement: &
|
|
171
|
+
requirement: &72324460 !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: *72324460
|
|
180
180
|
- !ruby/object:Gem::Dependency
|
|
181
181
|
name: formtastic
|
|
182
|
-
requirement: &
|
|
182
|
+
requirement: &72324230 !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: *72324230
|
|
191
191
|
- !ruby/object:Gem::Dependency
|
|
192
192
|
name: simple-navigation
|
|
193
|
-
requirement: &
|
|
193
|
+
requirement: &72323990 !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: *72323990
|
|
202
202
|
- !ruby/object:Gem::Dependency
|
|
203
203
|
name: resque
|
|
204
|
-
requirement: &
|
|
204
|
+
requirement: &72323650 !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: *72323650
|
|
213
213
|
- !ruby/object:Gem::Dependency
|
|
214
214
|
name: modernizr-rails
|
|
215
|
-
requirement: &
|
|
215
|
+
requirement: &72323290 !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: *72323290
|
|
224
224
|
- !ruby/object:Gem::Dependency
|
|
225
225
|
name: thinking-sphinx
|
|
226
|
-
requirement: &
|
|
226
|
+
requirement: &72322960 !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: *72322960
|
|
235
235
|
- !ruby/object:Gem::Dependency
|
|
236
236
|
name: sass-rails
|
|
237
|
-
requirement: &
|
|
237
|
+
requirement: &72300990 !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: *72300990
|
|
246
246
|
- !ruby/object:Gem::Dependency
|
|
247
247
|
name: rails_autolink
|
|
248
|
-
requirement: &
|
|
248
|
+
requirement: &72300760 !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: *72300760
|
|
257
257
|
- !ruby/object:Gem::Dependency
|
|
258
258
|
name: social_cheesecake
|
|
259
|
-
requirement: &
|
|
259
|
+
requirement: &72300520 !ruby/object:Gem::Requirement
|
|
260
260
|
none: false
|
|
261
261
|
requirements:
|
|
262
262
|
- - ~>
|
|
@@ -264,10 +264,10 @@ dependencies:
|
|
|
264
264
|
version: 0.3.0
|
|
265
265
|
type: :runtime
|
|
266
266
|
prerelease: false
|
|
267
|
-
version_requirements: *
|
|
267
|
+
version_requirements: *72300520
|
|
268
268
|
- !ruby/object:Gem::Dependency
|
|
269
269
|
name: i18n-js
|
|
270
|
-
requirement: &
|
|
270
|
+
requirement: &72300270 !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: *72300270
|
|
279
279
|
- !ruby/object:Gem::Dependency
|
|
280
280
|
name: capybara
|
|
281
|
-
requirement: &
|
|
281
|
+
requirement: &72299980 !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: *72299980
|
|
290
290
|
- !ruby/object:Gem::Dependency
|
|
291
291
|
name: sqlite3-ruby
|
|
292
|
-
requirement: &
|
|
292
|
+
requirement: &72299730 !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: *72299730
|
|
301
301
|
- !ruby/object:Gem::Dependency
|
|
302
302
|
name: ruby-debug19
|
|
303
|
-
requirement: &
|
|
303
|
+
requirement: &72299360 !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: *72299360
|
|
312
312
|
- !ruby/object:Gem::Dependency
|
|
313
313
|
name: rspec-rails
|
|
314
|
-
requirement: &
|
|
314
|
+
requirement: &72299000 !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: *72299000
|
|
323
323
|
- !ruby/object:Gem::Dependency
|
|
324
324
|
name: factory_girl
|
|
325
|
-
requirement: &
|
|
325
|
+
requirement: &72298750 !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: *72298750
|
|
334
334
|
- !ruby/object:Gem::Dependency
|
|
335
335
|
name: forgery
|
|
336
|
-
requirement: &
|
|
336
|
+
requirement: &72298450 !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: *72298450
|
|
345
345
|
- !ruby/object:Gem::Dependency
|
|
346
346
|
name: ci_reporter
|
|
347
|
-
requirement: &
|
|
347
|
+
requirement: &72298120 !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: *72298120
|
|
356
356
|
- !ruby/object:Gem::Dependency
|
|
357
357
|
name: nifty-generators
|
|
358
|
-
requirement: &
|
|
358
|
+
requirement: &72297780 !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: *72297780
|
|
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
|
|
|
@@ -442,6 +442,8 @@ files:
|
|
|
442
442
|
- app/assets/images/btn/btn_star.png
|
|
443
443
|
- app/assets/images/btn/btn_tag.png
|
|
444
444
|
- app/assets/images/btn/btn_write.png
|
|
445
|
+
- app/assets/images/btn/cheese_close_edit.png
|
|
446
|
+
- app/assets/images/btn/cheese_edit.png
|
|
445
447
|
- app/assets/images/btn/close.png
|
|
446
448
|
- app/assets/images/btn/date.png
|
|
447
449
|
- app/assets/images/btn/delete.png
|