social_stream-base 2.0.2 → 2.0.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/social_stream-base.js +1 -1
- data/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass +6 -2
- data/app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass +0 -6
- data/app/assets/stylesheets/social_stream/base/sidebar/responsive/_responsive-1200px-min.css.sass +2 -0
- data/app/assets/stylesheets/social_stream/fonts/fonts.css +3 -3
- data/config/locales/en.yml +1 -2
- data/lib/social_stream/base/ability.rb +1 -1
- data/lib/social_stream/base/dependencies.rb +2 -0
- data/lib/social_stream/base/engine.rb +4 -0
- data/lib/social_stream/base/version.rb +1 -1
- data/social_stream-base.gemspec +5 -3
- metadata +22 -8
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: cd89df7e42fd7901d1d336d47e00ea72d41ef925
|
4
|
+
data.tar.gz: 6592c04a04bbe762b083916784660eb2c42ff851
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3033534f08f9cd002c68034f78e3429a33a3fa9a58db059ba7a3b644d249cc4c627f741b483e85a0e12af657bf17de878500e012e1428d21eeef81207c62b750
|
7
|
+
data.tar.gz: 748c0a830f3fd30088dc402812b7fe38214e3836faec2177e253964554a25a25c593f998cf51feb2d4b05fce9eeda774d0def1dfcf2c6f93378a05e331ec9d86
|
@@ -33,6 +33,11 @@
|
|
33
33
|
input
|
34
34
|
&[type="submit"]
|
35
35
|
@include btn-secundary
|
36
|
+
.personal
|
37
|
+
form.edit_profile
|
38
|
+
h6
|
39
|
+
label
|
40
|
+
display: inline
|
36
41
|
.avatar
|
37
42
|
form.edit_actor
|
38
43
|
background-color: $white
|
@@ -46,5 +51,4 @@
|
|
46
51
|
h5
|
47
52
|
color: $grayLighter
|
48
53
|
font-size: 17px
|
49
|
-
font-weight: bold
|
50
|
-
|
54
|
+
font-weight: bold
|
@@ -21,12 +21,12 @@
|
|
21
21
|
font-family: "Josefin OSP";
|
22
22
|
font-weight: normal;
|
23
23
|
font-style: normal;
|
24
|
-
src: url(social_stream/fonts/
|
24
|
+
src: url(social_stream/fonts/josefinSlab/JosefinSlabRegular.ttf);
|
25
25
|
}
|
26
26
|
|
27
27
|
@font-face{
|
28
28
|
font-family: 'Josefin Overlay';
|
29
29
|
font-weight: normal;
|
30
30
|
font-style: normal;
|
31
|
-
src: url(social_stream/fonts/
|
32
|
-
}
|
31
|
+
src: url(social_stream/fonts/josefinSlab/JosefinSlabOverlay.ttf);
|
32
|
+
}
|
data/config/locales/en.yml
CHANGED
@@ -224,8 +224,7 @@ en:
|
|
224
224
|
passwords:
|
225
225
|
confirm: Confirm password
|
226
226
|
forgot: Forgot your password?
|
227
|
-
instructions: '
|
228
|
-
you instructions to change it:'
|
227
|
+
instructions: 'Enter your email address and we will send you instructions to change it:'
|
229
228
|
update: Change your password
|
230
229
|
dropdown:
|
231
230
|
notifications: Notifications
|
@@ -90,7 +90,7 @@ module SocialStream
|
|
90
90
|
end
|
91
91
|
|
92
92
|
# Privacy
|
93
|
-
can [:create, :read, :update, :destroy], Relation::Custom, :actor_id => subject.try(:actor_id)
|
93
|
+
can [:create, :read, :update, :destroy], ::Relation::Custom, :actor_id => subject.try(:actor_id)
|
94
94
|
end
|
95
95
|
end
|
96
96
|
end
|
@@ -58,6 +58,10 @@ module SocialStream
|
|
58
58
|
|
59
59
|
config.to_prepare do
|
60
60
|
ApplicationController.rescue_handlers += [["CanCan::AccessDenied", :rescue_from_access_denied]]
|
61
|
+
|
62
|
+
# Load Relation::Public, so it is registered as descendant of Relation::Single
|
63
|
+
# and used in ActivityObject#allowed_relations
|
64
|
+
Relation::Public
|
61
65
|
end
|
62
66
|
end
|
63
67
|
end
|
data/social_stream-base.gemspec
CHANGED
@@ -31,9 +31,11 @@ Gem::Specification.new do |s|
|
|
31
31
|
# Slug generation
|
32
32
|
s.add_runtime_dependency('stringex', '~> 1.5.1')
|
33
33
|
# Avatar attachments
|
34
|
-
s.add_runtime_dependency('avatars_for_rails', '~> 1.0
|
34
|
+
s.add_runtime_dependency('avatars_for_rails', '~> 1.1.0')
|
35
35
|
# jQuery
|
36
|
-
s.add_runtime_dependency('jquery-rails', '>=
|
36
|
+
s.add_runtime_dependency('jquery-rails', '>= 3.0.0')
|
37
|
+
# jQuery UI
|
38
|
+
s.add_runtime_dependency('jquery-ui-rails', '>= 4.0.3')
|
37
39
|
# Select2 javascript library
|
38
40
|
s.add_runtime_dependency('select2-rails', '~> 3.3.0')
|
39
41
|
# Authorization
|
@@ -65,7 +67,7 @@ Gem::Specification.new do |s|
|
|
65
67
|
# I18n-js
|
66
68
|
s.add_runtime_dependency('i18n-js','~>2.1.2')
|
67
69
|
# Strong Parameters
|
68
|
-
s.add_runtime_dependency('strong_parameters','~> 0.1
|
70
|
+
s.add_runtime_dependency('strong_parameters','~> 0.2.1')
|
69
71
|
# Flash messages
|
70
72
|
s.add_runtime_dependency('flashy','~> 0.0.1')
|
71
73
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: social_stream-base
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- GING - DIT - UPM
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-
|
11
|
+
date: 2013-06-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: deep_merge
|
@@ -128,28 +128,42 @@ dependencies:
|
|
128
128
|
requirements:
|
129
129
|
- - ~>
|
130
130
|
- !ruby/object:Gem::Version
|
131
|
-
version: 1.0
|
131
|
+
version: 1.1.0
|
132
132
|
type: :runtime
|
133
133
|
prerelease: false
|
134
134
|
version_requirements: !ruby/object:Gem::Requirement
|
135
135
|
requirements:
|
136
136
|
- - ~>
|
137
137
|
- !ruby/object:Gem::Version
|
138
|
-
version: 1.0
|
138
|
+
version: 1.1.0
|
139
139
|
- !ruby/object:Gem::Dependency
|
140
140
|
name: jquery-rails
|
141
141
|
requirement: !ruby/object:Gem::Requirement
|
142
142
|
requirements:
|
143
143
|
- - '>='
|
144
144
|
- !ruby/object:Gem::Version
|
145
|
-
version:
|
145
|
+
version: 3.0.0
|
146
146
|
type: :runtime
|
147
147
|
prerelease: false
|
148
148
|
version_requirements: !ruby/object:Gem::Requirement
|
149
149
|
requirements:
|
150
150
|
- - '>='
|
151
151
|
- !ruby/object:Gem::Version
|
152
|
-
version:
|
152
|
+
version: 3.0.0
|
153
|
+
- !ruby/object:Gem::Dependency
|
154
|
+
name: jquery-ui-rails
|
155
|
+
requirement: !ruby/object:Gem::Requirement
|
156
|
+
requirements:
|
157
|
+
- - '>='
|
158
|
+
- !ruby/object:Gem::Version
|
159
|
+
version: 4.0.3
|
160
|
+
type: :runtime
|
161
|
+
prerelease: false
|
162
|
+
version_requirements: !ruby/object:Gem::Requirement
|
163
|
+
requirements:
|
164
|
+
- - '>='
|
165
|
+
- !ruby/object:Gem::Version
|
166
|
+
version: 4.0.3
|
153
167
|
- !ruby/object:Gem::Dependency
|
154
168
|
name: select2-rails
|
155
169
|
requirement: !ruby/object:Gem::Requirement
|
@@ -380,14 +394,14 @@ dependencies:
|
|
380
394
|
requirements:
|
381
395
|
- - ~>
|
382
396
|
- !ruby/object:Gem::Version
|
383
|
-
version: 0.1
|
397
|
+
version: 0.2.1
|
384
398
|
type: :runtime
|
385
399
|
prerelease: false
|
386
400
|
version_requirements: !ruby/object:Gem::Requirement
|
387
401
|
requirements:
|
388
402
|
- - ~>
|
389
403
|
- !ruby/object:Gem::Version
|
390
|
-
version: 0.1
|
404
|
+
version: 0.2.1
|
391
405
|
- !ruby/object:Gem::Dependency
|
392
406
|
name: flashy
|
393
407
|
requirement: !ruby/object:Gem::Requirement
|