social_stream-base 2.0.0.beta2 → 2.0.0.beta3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/images/icons/files_ico-50.png +0 -0
- data/app/assets/images/icons/files_ico-70.png +0 -0
- data/app/assets/images/logos/medium/group.png +0 -0
- data/app/assets/images/logos/medium/user.png +0 -0
- data/app/assets/images/logos/original/group.png +0 -0
- data/app/assets/images/logos/original/user.png +0 -0
- data/app/assets/images/logos/small/group.png +0 -0
- data/app/assets/images/logos/small/user.png +0 -0
- data/app/assets/javascripts/social_stream/contact.js +23 -56
- data/app/assets/javascripts/social_stream/object.js +5 -0
- data/app/assets/javascripts/social_stream/relation_customs.js +1 -1
- data/app/assets/javascripts/social_stream/wall.js +1 -0
- data/app/assets/stylesheets/social_stream/base/{_adjust.css.sass → adjust/_adjust.css.sass} +1 -5
- data/app/assets/stylesheets/social_stream/base/adjust/layout/_adjust.css.sass +10 -0
- data/app/assets/stylesheets/social_stream/base/adjust.css.sass +5 -0
- data/app/assets/stylesheets/social_stream/base/{_buttons.scss.sass → buttons/_buttons.scss.sass} +0 -0
- data/app/assets/stylesheets/social_stream/base/buttons.css.sass +2 -0
- data/app/assets/stylesheets/social_stream/base/contacts/_contacts.css.sass +12 -7
- data/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass +35 -27
- data/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-1200px-min.css.sass +13 -3
- data/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-767px-max.css.sass +38 -3
- data/app/assets/stylesheets/social_stream/base/contacts.css.sass +10 -0
- data/app/assets/stylesheets/social_stream/base/conversation/_conversation.css.sass +3 -3
- data/app/assets/stylesheets/social_stream/base/conversation/layout/_conversation.css.sass +3 -0
- data/app/assets/stylesheets/social_stream/base/conversation/responsive/_responsive-767px-max.css.sass +4 -1
- data/app/assets/stylesheets/social_stream/base/conversation.css.sass +10 -0
- data/app/assets/stylesheets/social_stream/base/explore/_explore.css.sass +8 -3
- data/app/assets/stylesheets/social_stream/base/explore/layout/_explore-search.css.sass +1 -0
- data/app/assets/stylesheets/social_stream/base/explore/layout/_explore-timeline.css.sass +9 -5
- data/app/assets/stylesheets/social_stream/base/explore/layout/_explore.css.sass +4 -5
- data/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-1200px-min.css.sass +12 -10
- data/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-767px-max.css.sass +2 -0
- data/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-768px-979px.css.sass +2 -0
- data/app/assets/stylesheets/social_stream/base/explore.css.sass +18 -0
- data/app/assets/stylesheets/social_stream/base/footer/layout/_footer.css.sass +4 -3
- data/app/assets/stylesheets/social_stream/base/footer.css.sass +2 -0
- data/app/assets/stylesheets/social_stream/base/frontpage_devise.css.sass +16 -0
- data/app/assets/stylesheets/social_stream/base/groups/_groups.css.sass +17 -0
- data/app/assets/stylesheets/social_stream/base/{_groups.css.sass → groups/layout/_groups.css.sass} +2 -7
- data/app/assets/stylesheets/social_stream/base/icons/icon.css.css +52 -38
- data/app/assets/stylesheets/social_stream/base/icons.css.sass +2 -0
- data/app/assets/stylesheets/social_stream/base/{_jquery-ui.css.sass → jquery-ui/_jquery-ui.css.sass} +0 -0
- data/app/assets/stylesheets/social_stream/base/jquery-ui.css.sass +10 -0
- data/app/assets/stylesheets/social_stream/base/layouts/_header.css.sass +10 -5
- data/app/assets/stylesheets/social_stream/base/layouts/_layout.css.sass +4 -2
- data/app/assets/stylesheets/social_stream/base/layouts.css.sass +2 -0
- data/app/assets/stylesheets/social_stream/base/logo.css.sass +7 -0
- data/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass +11 -12
- data/app/assets/stylesheets/social_stream/base/mixins/_colorfont.css.sass +2 -1
- data/app/assets/stylesheets/social_stream/base/mixins.css.sass +10 -0
- data/app/assets/stylesheets/social_stream/base/notifications.css.sass +10 -0
- data/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass +29 -19
- data/app/assets/stylesheets/social_stream/base/profile/layout/_profile.css.sass +42 -47
- data/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-1200px-min.css.sass +2 -4
- data/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-767px-max.css.sass +12 -4
- data/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-768px-979px.css.sass +4 -5
- data/app/assets/stylesheets/social_stream/base/profile.css.sass +10 -0
- data/app/assets/stylesheets/social_stream/base/responsive/_responsive-1200px-min.css.sass +7 -4
- data/app/assets/stylesheets/social_stream/base/responsive/_responsive-767px-max.css.sass +1 -2
- data/app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass +4 -1
- data/app/assets/stylesheets/social_stream/base/responsive.css.sass +6 -0
- data/app/assets/stylesheets/social_stream/base/search.css.sass +2 -0
- data/app/assets/stylesheets/social_stream/base/select2.css.sass +5 -0
- data/app/assets/stylesheets/social_stream/base/settings/_settings.css.sass +1 -2
- data/app/assets/stylesheets/social_stream/base/settings/layout/_settings.css.sass +5 -0
- data/app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-767px-max.css.sass +2 -1
- data/app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-768px-979px.css.sass +4 -2
- data/app/assets/stylesheets/social_stream/base/settings.css.sass +10 -0
- data/app/assets/stylesheets/social_stream/base/sidebar/_sidebar.css.sass +1 -1
- data/app/assets/stylesheets/social_stream/base/sidebar/layout/_sidebar.css.sass +4 -1
- data/app/assets/stylesheets/social_stream/base/sidebar.css.sass +8 -0
- data/app/assets/stylesheets/social_stream/base/timeline/_timeline.css.sass +4 -9
- data/app/assets/stylesheets/social_stream/base/timeline/_wrapper_activities.css.sass +4 -2
- data/app/assets/stylesheets/social_stream/base/timeline/layout/_timeline.css.sass +34 -0
- data/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-1200px-min.css.sass +14 -0
- data/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-767px-max.css.sass +28 -0
- data/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-768px-979px.css.sass +14 -0
- data/app/assets/stylesheets/social_stream/base/timeline.css.sass +14 -0
- data/app/assets/stylesheets/social_stream/base/toolbar/_toolbar.css.sass +28 -8
- data/app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-1200px-min.css.sass +1 -2
- data/app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-767px-max.css.sass +14 -2
- data/app/assets/stylesheets/social_stream/base/toolbar.css.sass +10 -0
- data/app/assets/stylesheets/social_stream/bootstrap-rewrite/_button-groups.scss +1 -1
- data/app/assets/stylesheets/social_stream/bootstrap-rewrite/_forms.scss +8 -0
- data/app/assets/stylesheets/social_stream/bootstrap-rewrite/_nav.scss +4 -0
- data/app/assets/stylesheets/social_stream/fonts/JosefinSlabOverlay.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/JosefinSlabRegular-Outline.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/JosefinSlabRegular.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/colorfont.css +4 -4
- data/app/assets/stylesheets/social_stream/fonts/fonts.css +4 -4
- data/app/assets/stylesheets/social_stream/fonts/social-stream:fonts:colorfont.css.sass +5 -0
- data/app/assets/stylesheets/social_stream/fonts/social-stream:fonts:fonts.css.sass +5 -0
- data/app/assets/stylesheets/social_stream-base.css.sass +81 -2
- data/app/controllers/repositories_controller.rb +2 -3
- data/app/helpers/contacts_helper.rb +30 -17
- data/app/models/activity_object.rb +16 -17
- data/app/models/profile.rb +0 -4
- data/app/views/activities/_root.html.erb +1 -1
- data/app/views/activities/_timeline_modal.html.erb +2 -2
- data/app/views/contacts/_contact.html.erb +2 -2
- data/app/views/contacts/index.html.erb +6 -0
- data/app/views/explore/_followed.html.erb +6 -6
- data/app/views/groups/{_new.html.erb → _form.html.erb} +4 -7
- data/app/views/groups/_new_modal.html.erb +11 -0
- data/app/views/groups/new.html.erb +5 -1
- data/app/views/layouts/_footer.html.erb +1 -1
- data/app/views/layouts/application.html.erb +7 -8
- data/app/views/profiles/_avatar.html.erb +9 -9
- data/app/views/profiles/_comunication-info.html.erb +8 -8
- data/app/views/profiles/_experience.html.erb +15 -15
- data/app/views/profiles/_personal.html.erb +13 -12
- data/app/views/profiles/_profile.html.erb +33 -26
- data/app/views/profiles/_tags.html.erb +8 -12
- data/app/views/subjects/_subject.html.erb +1 -1
- data/app/views/toolbar/_logo.html.erb +6 -7
- data/app/views/toolbar/_profile.html.erb +9 -12
- data/config/locales/en.yml +462 -444
- data/config/locales/es.yml +464 -461
- data/config/locales/pt.yml +504 -379
- data/config/locales/zh.yml +479 -409
- data/lib/social_stream/base/version.rb +1 -1
- data/lib/social_stream/population/actor.rb +10 -0
- data/lib/social_stream/search.rb +11 -2
- data/lib/tasks/db/populate.rake +57 -16
- data/social_stream-base.gemspec +1 -1
- data/spec/views/profiles_spec.rb +5 -3
- metadata +41 -31
- data/app/assets/stylesheets/social_stream/fonts/BreeSerif-Regular.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Original.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Outline.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Overlay.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Original.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Outline.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Overlay.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/RockSalt.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SIL OFL Font License - Source Sans Pro.txt +0 -93
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Black.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-BlackIt.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Bold.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-BoldIt.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-ExtraLight.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-It.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Light.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-LightIt.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Regular.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Semibold.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf +0 -0
data/lib/social_stream/search.rb
CHANGED
@@ -104,12 +104,21 @@ module SocialStream
|
|
104
104
|
options[:mode] ||= :extended
|
105
105
|
|
106
106
|
models = models(options[:mode], options[:key])
|
107
|
-
|
107
|
+
|
108
|
+
with = {}
|
109
|
+
|
110
|
+
if options[:owner].present?
|
111
|
+
with[:owner_id] = Actor.normalize_id(options[:owner])
|
112
|
+
end
|
113
|
+
|
114
|
+
if subject != options[:owner] || options[:owner].blank?
|
115
|
+
with[:relation_ids] = Relation.ids_shared_with(subject)
|
116
|
+
end
|
108
117
|
|
109
118
|
[
|
110
119
|
query,
|
111
120
|
:classes => models,
|
112
|
-
:with =>
|
121
|
+
:with => with
|
113
122
|
]
|
114
123
|
end
|
115
124
|
end
|
data/lib/tasks/db/populate.rake
CHANGED
@@ -78,16 +78,6 @@ namespace :db do
|
|
78
78
|
puts 'Groups population (' + @GROUPS.to_s + ' groups)'
|
79
79
|
groups_start = Time.now
|
80
80
|
|
81
|
-
def set_tags(klass)
|
82
|
-
klass.all.each do |el|
|
83
|
-
el.tag_list = Forgery::LoremIpsum.words(1,:random => true)+", "+
|
84
|
-
Forgery::LoremIpsum.words(1,:random => true)+", "+
|
85
|
-
Forgery::LoremIpsum.words(1,:random => true)
|
86
|
-
el.save!
|
87
|
-
end
|
88
|
-
end
|
89
|
-
|
90
|
-
|
91
81
|
@GROUPS.times do
|
92
82
|
founder = @available_actors[rand(@available_actors.size)]
|
93
83
|
|
@@ -97,8 +87,6 @@ namespace :db do
|
|
97
87
|
:user_author_id => founder.id
|
98
88
|
end
|
99
89
|
|
100
|
-
set_tags(Group)
|
101
|
-
|
102
90
|
# Reload actors to include groups
|
103
91
|
@available_actors = Actor.all
|
104
92
|
|
@@ -106,6 +94,60 @@ namespace :db do
|
|
106
94
|
puts ' -> ' + (groups_end - groups_start).round(4).to_s + 's'
|
107
95
|
end
|
108
96
|
|
97
|
+
desc "Populate profiles"
|
98
|
+
|
99
|
+
task :profiles => :read_environment do
|
100
|
+
puts "Profiles population"
|
101
|
+
time = Time.now
|
102
|
+
|
103
|
+
SocialStream::Population::Actor.available.each do |a|
|
104
|
+
p = a.profile
|
105
|
+
|
106
|
+
if rand < 0.2
|
107
|
+
a.tag_list = Forgery::LoremIpsum.words(3, random: true).gsub(' ', ',')
|
108
|
+
end
|
109
|
+
|
110
|
+
if rand < 0.2
|
111
|
+
p.organization = Forgery::Name.company_name
|
112
|
+
end
|
113
|
+
|
114
|
+
if rand < 0.2
|
115
|
+
p.birthday = Time.at(Time.now.to_i - (18.years + rand(60.years)))
|
116
|
+
end
|
117
|
+
|
118
|
+
if rand < 0.2
|
119
|
+
p.city = Forgery::Address.city
|
120
|
+
end
|
121
|
+
|
122
|
+
if rand < 0.2
|
123
|
+
p.country = Forgery::Address.country
|
124
|
+
end
|
125
|
+
|
126
|
+
if rand < 0.2
|
127
|
+
p.description = Forgery::LoremIpsum.sentences(2, random: true)
|
128
|
+
end
|
129
|
+
|
130
|
+
if rand < 0.2
|
131
|
+
p.phone = Forgery::Address.phone
|
132
|
+
end
|
133
|
+
|
134
|
+
if rand < 0.2
|
135
|
+
p.address = Forgery::Address.street_address
|
136
|
+
end
|
137
|
+
|
138
|
+
if rand < 0.2
|
139
|
+
p.website = "http://#{ Forgery::Internet.domain_name }"
|
140
|
+
end
|
141
|
+
|
142
|
+
if rand < 0.2
|
143
|
+
p.experience = Forgery::LoremIpsum.sentences(3, random: true)
|
144
|
+
end
|
145
|
+
|
146
|
+
p.save!
|
147
|
+
end
|
148
|
+
|
149
|
+
puts ' -> ' + (Time.now - time).round(4).to_s + 's'
|
150
|
+
end
|
109
151
|
|
110
152
|
# TIES
|
111
153
|
desc "Create ties"
|
@@ -113,8 +155,7 @@ namespace :db do
|
|
113
155
|
puts 'Ties population'
|
114
156
|
ties_start = Time.now
|
115
157
|
|
116
|
-
|
117
|
-
actors = @available_actors.dup
|
158
|
+
SocialStream::Population::Actor.available.each do |a|
|
118
159
|
actors.delete(a)
|
119
160
|
|
120
161
|
relations = a.relation_customs + [ Relation::Reject.instance ]
|
@@ -145,8 +186,8 @@ namespace :db do
|
|
145
186
|
puts 'Ties population (Cheesecake version)'
|
146
187
|
ties_start = Time.now
|
147
188
|
|
148
|
-
|
149
|
-
actors =
|
189
|
+
SocialStream::Population::Actor.available.each do |a|
|
190
|
+
actors = SocialStream::Population::Actor.available - Array(a)
|
150
191
|
relations = a.relation_customs + Array.wrap(Relation::Reject.instance)
|
151
192
|
break if actors.size==0
|
152
193
|
actor = Actor.first
|
data/social_stream-base.gemspec
CHANGED
@@ -57,7 +57,7 @@ Gem::Specification.new do |s|
|
|
57
57
|
# Syntactically Awesome Stylesheets
|
58
58
|
s.add_runtime_dependency('sass-rails', '>= 3.1.0')
|
59
59
|
# Bootstrap for Sass
|
60
|
-
s.add_runtime_dependency('bootstrap-sass', '~> 2.
|
60
|
+
s.add_runtime_dependency('bootstrap-sass', '~> 2.3.1.0')
|
61
61
|
# Customize ERB views
|
62
62
|
s.add_runtime_dependency('deface', '~> 0.9.1')
|
63
63
|
# Autolink text blocks
|
data/spec/views/profiles_spec.rb
CHANGED
@@ -14,7 +14,9 @@ describe 'profiles/show' do
|
|
14
14
|
email: "other-user@test.com",
|
15
15
|
language: 'en',
|
16
16
|
to_param: "other-user",
|
17
|
-
contact_to!: stub_model(Contact, { id: 3 })
|
17
|
+
actor: stub_model(Actor, { contact_to!: stub_model(Contact, { id: 3 })}),
|
18
|
+
contact_to!: stub_model(Contact, { id: 3 }),
|
19
|
+
suggestions: []
|
18
20
|
})
|
19
21
|
}
|
20
22
|
|
@@ -27,8 +29,6 @@ describe 'profiles/show' do
|
|
27
29
|
to_param: "test-group" } ) }
|
28
30
|
|
29
31
|
before do
|
30
|
-
view.stub(:sidebar)
|
31
|
-
|
32
32
|
assign :profile, profile
|
33
33
|
end
|
34
34
|
|
@@ -59,6 +59,7 @@ describe 'profiles/show' do
|
|
59
59
|
before do
|
60
60
|
view.stub(:current_subject).and_return(other_user)
|
61
61
|
view.stub(:current_user).and_return(other_user)
|
62
|
+
view.stub(:current_actor).and_return(other_user.actor)
|
62
63
|
view.stub(:profile_or_current_subject).and_return(other_user)
|
63
64
|
view.stub(:user_signed_in?).and_return(true)
|
64
65
|
view.stub(:can?).and_return(false)
|
@@ -76,6 +77,7 @@ describe 'profiles/show' do
|
|
76
77
|
before do
|
77
78
|
view.stub(:current_subject).and_return(other_user)
|
78
79
|
view.stub(:current_user).and_return(other_user)
|
80
|
+
view.stub(:current_actor).and_return(other_user.actor)
|
79
81
|
view.stub(:profile_or_current_subject).and_return(other_user)
|
80
82
|
view.stub(:user_signed_in?).and_return(true)
|
81
83
|
view.stub(:can?).and_return(false)
|
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.0.
|
4
|
+
version: 2.0.0.beta3
|
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-04-
|
11
|
+
date: 2013-04-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: deep_merge
|
@@ -324,14 +324,14 @@ dependencies:
|
|
324
324
|
requirements:
|
325
325
|
- - ~>
|
326
326
|
- !ruby/object:Gem::Version
|
327
|
-
version: 2.
|
327
|
+
version: 2.3.1.0
|
328
328
|
type: :runtime
|
329
329
|
prerelease: false
|
330
330
|
version_requirements: !ruby/object:Gem::Requirement
|
331
331
|
requirements:
|
332
332
|
- - ~>
|
333
333
|
- !ruby/object:Gem::Version
|
334
|
-
version: 2.
|
334
|
+
version: 2.3.1.0
|
335
335
|
- !ruby/object:Gem::Dependency
|
336
336
|
name: deface
|
337
337
|
requirement: !ruby/object:Gem::Requirement
|
@@ -602,20 +602,24 @@ files:
|
|
602
602
|
- app/assets/javascripts/social_stream/user.js
|
603
603
|
- app/assets/javascripts/social_stream/wall.js
|
604
604
|
- app/assets/stylesheets/social_stream-base.css.sass
|
605
|
-
- app/assets/stylesheets/social_stream/base/
|
606
|
-
- app/assets/stylesheets/social_stream/base/
|
607
|
-
- app/assets/stylesheets/social_stream/base/
|
608
|
-
- app/assets/stylesheets/social_stream/base/
|
605
|
+
- app/assets/stylesheets/social_stream/base/adjust.css.sass
|
606
|
+
- app/assets/stylesheets/social_stream/base/adjust/_adjust.css.sass
|
607
|
+
- app/assets/stylesheets/social_stream/base/adjust/layout/_adjust.css.sass
|
608
|
+
- app/assets/stylesheets/social_stream/base/buttons.css.sass
|
609
|
+
- app/assets/stylesheets/social_stream/base/buttons/_buttons.scss.sass
|
610
|
+
- app/assets/stylesheets/social_stream/base/contacts.css.sass
|
609
611
|
- app/assets/stylesheets/social_stream/base/contacts/_contacts.css.sass
|
610
612
|
- app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass
|
611
613
|
- app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-1200px-min.css.sass
|
612
614
|
- app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-767px-max.css.sass
|
613
615
|
- app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-768px-979px.css.sass
|
616
|
+
- app/assets/stylesheets/social_stream/base/conversation.css.sass
|
614
617
|
- app/assets/stylesheets/social_stream/base/conversation/_conversation.css.sass
|
615
618
|
- app/assets/stylesheets/social_stream/base/conversation/layout/_conversation.css.sass
|
616
619
|
- app/assets/stylesheets/social_stream/base/conversation/responsive/_responsive-1200px-min.css.sass
|
617
620
|
- app/assets/stylesheets/social_stream/base/conversation/responsive/_responsive-767px-max.css.sass
|
618
621
|
- app/assets/stylesheets/social_stream/base/conversation/responsive/_responsive-768px-979px.css.sass
|
622
|
+
- app/assets/stylesheets/social_stream/base/explore.css.sass
|
619
623
|
- app/assets/stylesheets/social_stream/base/explore/_explore-search.css.sass
|
620
624
|
- app/assets/stylesheets/social_stream/base/explore/_explore-timeline.css.sass
|
621
625
|
- app/assets/stylesheets/social_stream/base/explore/_explore.css.sass
|
@@ -625,7 +629,9 @@ files:
|
|
625
629
|
- app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-1200px-min.css.sass
|
626
630
|
- app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-767px-max.css.sass
|
627
631
|
- app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-768px-979px.css.sass
|
632
|
+
- app/assets/stylesheets/social_stream/base/footer.css.sass
|
628
633
|
- app/assets/stylesheets/social_stream/base/footer/layout/_footer.css.sass
|
634
|
+
- app/assets/stylesheets/social_stream/base/frontpage_devise.css.sass
|
629
635
|
- app/assets/stylesheets/social_stream/base/frontpage_devise/_devise.css.sass
|
630
636
|
- app/assets/stylesheets/social_stream/base/frontpage_devise/_frontpage.css.sass
|
631
637
|
- app/assets/stylesheets/social_stream/base/frontpage_devise/layout/_devise.css.sass
|
@@ -633,47 +639,67 @@ files:
|
|
633
639
|
- app/assets/stylesheets/social_stream/base/frontpage_devise/responsive/_responsive-1200px-min.css.sass
|
634
640
|
- app/assets/stylesheets/social_stream/base/frontpage_devise/responsive/_responsive-767px-max.css.sass
|
635
641
|
- app/assets/stylesheets/social_stream/base/frontpage_devise/responsive/_responsive-768px-979px.css.sass
|
642
|
+
- app/assets/stylesheets/social_stream/base/groups/_groups.css.sass
|
643
|
+
- app/assets/stylesheets/social_stream/base/groups/layout/_groups.css.sass
|
644
|
+
- app/assets/stylesheets/social_stream/base/icons.css.sass
|
636
645
|
- app/assets/stylesheets/social_stream/base/icons/icon.css.css
|
646
|
+
- app/assets/stylesheets/social_stream/base/jquery-ui.css.sass
|
647
|
+
- app/assets/stylesheets/social_stream/base/jquery-ui/_jquery-ui.css.sass
|
648
|
+
- app/assets/stylesheets/social_stream/base/layouts.css.sass
|
637
649
|
- app/assets/stylesheets/social_stream/base/layouts/_header.css.sass
|
638
650
|
- app/assets/stylesheets/social_stream/base/layouts/_layout.css.sass
|
651
|
+
- app/assets/stylesheets/social_stream/base/logo.css.sass
|
639
652
|
- app/assets/stylesheets/social_stream/base/logo/_logo-in.css
|
640
653
|
- app/assets/stylesheets/social_stream/base/logo/_logo-out.css
|
641
654
|
- app/assets/stylesheets/social_stream/base/logo/layout/_logo-in.css.sass
|
642
655
|
- app/assets/stylesheets/social_stream/base/logo/layout/_logo-out.css
|
643
656
|
- app/assets/stylesheets/social_stream/base/logo/responsive/_responsive-767px-max.css.sass
|
657
|
+
- app/assets/stylesheets/social_stream/base/mixins.css.sass
|
644
658
|
- app/assets/stylesheets/social_stream/base/mixins/_animation.css.sass
|
645
659
|
- app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass
|
646
660
|
- app/assets/stylesheets/social_stream/base/mixins/_colorfont.css.sass
|
647
661
|
- app/assets/stylesheets/social_stream/base/mixins/_inputs.css.sass
|
648
662
|
- app/assets/stylesheets/social_stream/base/mixins/_layout.css.sass
|
663
|
+
- app/assets/stylesheets/social_stream/base/notifications.css.sass
|
649
664
|
- app/assets/stylesheets/social_stream/base/notifications/_notifications.css.sass
|
650
665
|
- app/assets/stylesheets/social_stream/base/notifications/layout/_notifications.css.sass
|
651
666
|
- app/assets/stylesheets/social_stream/base/notifications/responsive/_responsive-1200px-min.css.sass
|
652
667
|
- app/assets/stylesheets/social_stream/base/notifications/responsive/_responsive-767px-max.css.sass
|
653
668
|
- app/assets/stylesheets/social_stream/base/notifications/responsive/_responsive-768px-979px.css.sass
|
669
|
+
- app/assets/stylesheets/social_stream/base/profile.css.sass
|
654
670
|
- app/assets/stylesheets/social_stream/base/profile/_profile.css.sass
|
655
671
|
- app/assets/stylesheets/social_stream/base/profile/layout/_profile.css.sass
|
656
672
|
- app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-1200px-min.css.sass
|
657
673
|
- app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-767px-max.css.sass
|
658
674
|
- app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-768px-979px.css.sass
|
675
|
+
- app/assets/stylesheets/social_stream/base/responsive.css.sass
|
659
676
|
- app/assets/stylesheets/social_stream/base/responsive/_responsive-1200px-min.css.sass
|
660
677
|
- app/assets/stylesheets/social_stream/base/responsive/_responsive-767px-max.css.sass
|
661
678
|
- app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass
|
679
|
+
- app/assets/stylesheets/social_stream/base/search.css.sass
|
662
680
|
- app/assets/stylesheets/social_stream/base/search/_header.css.sass
|
681
|
+
- app/assets/stylesheets/social_stream/base/select2.css.sass
|
663
682
|
- app/assets/stylesheets/social_stream/base/select2/_sselect2.css.sass
|
664
683
|
- app/assets/stylesheets/social_stream/base/select2/layout/_sselect2.css.sass
|
684
|
+
- app/assets/stylesheets/social_stream/base/settings.css.sass
|
665
685
|
- app/assets/stylesheets/social_stream/base/settings/_settings.css.sass
|
666
686
|
- app/assets/stylesheets/social_stream/base/settings/layout/_settings.css.sass
|
667
687
|
- app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-1200px-min.css.sass
|
668
688
|
- app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-767px-max.css.sass
|
669
689
|
- app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-768px-979px.css.sass
|
690
|
+
- app/assets/stylesheets/social_stream/base/sidebar.css.sass
|
670
691
|
- app/assets/stylesheets/social_stream/base/sidebar/_sidebar.css.sass
|
671
692
|
- app/assets/stylesheets/social_stream/base/sidebar/layout/_sidebar.css.sass
|
672
693
|
- app/assets/stylesheets/social_stream/base/sidebar/responsive/_responsive-1200px-min.css.sass
|
694
|
+
- app/assets/stylesheets/social_stream/base/timeline.css.sass
|
673
695
|
- app/assets/stylesheets/social_stream/base/timeline/_timeline.css.sass
|
674
696
|
- app/assets/stylesheets/social_stream/base/timeline/_wrapper_activities.css.sass
|
675
697
|
- app/assets/stylesheets/social_stream/base/timeline/layout/_timeline.css.sass
|
676
698
|
- app/assets/stylesheets/social_stream/base/timeline/layout/_wrapper_activities.css.sass
|
699
|
+
- app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-1200px-min.css.sass
|
700
|
+
- app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-767px-max.css.sass
|
701
|
+
- app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-768px-979px.css.sass
|
702
|
+
- app/assets/stylesheets/social_stream/base/toolbar.css.sass
|
677
703
|
- app/assets/stylesheets/social_stream/base/toolbar/_toolbar.css.sass
|
678
704
|
- app/assets/stylesheets/social_stream/base/toolbar/layout/_toolbar.css.sass
|
679
705
|
- app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-1200px-min.css.sass
|
@@ -687,36 +713,19 @@ files:
|
|
687
713
|
- app/assets/stylesheets/social_stream/bootstrap-rewrite/_nav.scss
|
688
714
|
- app/assets/stylesheets/social_stream/bootstrap-rewrite/_navbar.scss
|
689
715
|
- app/assets/stylesheets/social_stream/bootstrap-rewrite/_variables.scss
|
690
|
-
- app/assets/stylesheets/social_stream/fonts/BreeSerif-Regular.ttf
|
691
|
-
- app/assets/stylesheets/social_stream/fonts/DIN_OSP-Original.ttf
|
692
|
-
- app/assets/stylesheets/social_stream/fonts/DIN_OSP-Outline.ttf
|
693
|
-
- app/assets/stylesheets/social_stream/fonts/DIN_OSP-Overlay.ttf
|
694
|
-
- app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Original.ttf
|
695
|
-
- app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Outline.ttf
|
696
|
-
- app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Overlay.ttf
|
697
716
|
- app/assets/stylesheets/social_stream/fonts/GiveYouGlory.ttf
|
717
|
+
- app/assets/stylesheets/social_stream/fonts/JosefinSlabOverlay.ttf
|
718
|
+
- app/assets/stylesheets/social_stream/fonts/JosefinSlabRegular-Outline.ttf
|
719
|
+
- app/assets/stylesheets/social_stream/fonts/JosefinSlabRegular.ttf
|
698
720
|
- app/assets/stylesheets/social_stream/fonts/OpenSans-Light.ttf
|
699
|
-
- app/assets/stylesheets/social_stream/fonts/RockSalt.ttf
|
700
721
|
- app/assets/stylesheets/social_stream/fonts/colorfont.css
|
701
722
|
- app/assets/stylesheets/social_stream/fonts/fonts.css
|
702
723
|
- app/assets/stylesheets/social_stream/fonts/opensans-regular-webfont.eot
|
703
724
|
- app/assets/stylesheets/social_stream/fonts/opensans-regular-webfont.svg
|
704
725
|
- app/assets/stylesheets/social_stream/fonts/opensans-regular-webfont.woff
|
705
726
|
- app/assets/stylesheets/social_stream/fonts/opensans-regular.ttf
|
706
|
-
- app/assets/stylesheets/social_stream/fonts/
|
707
|
-
|
708
|
-
- app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Black.otf
|
709
|
-
- app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-BlackIt.otf
|
710
|
-
- app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Bold.otf
|
711
|
-
- app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-BoldIt.otf
|
712
|
-
- app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-ExtraLight.otf
|
713
|
-
- app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf
|
714
|
-
- app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-It.otf
|
715
|
-
- app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Light.otf
|
716
|
-
- app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-LightIt.otf
|
717
|
-
- app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Regular.otf
|
718
|
-
- app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Semibold.otf
|
719
|
-
- app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf
|
727
|
+
- app/assets/stylesheets/social_stream/fonts/social-stream:fonts:colorfont.css.sass
|
728
|
+
- app/assets/stylesheets/social_stream/fonts/social-stream:fonts:fonts.css.sass
|
720
729
|
- app/controllers/activities_controller.rb
|
721
730
|
- app/controllers/activity_actions_controller.rb
|
722
731
|
- app/controllers/api_controller.rb
|
@@ -885,9 +894,10 @@ files:
|
|
885
894
|
- app/views/frontpage/_presentation_default.html.erb
|
886
895
|
- app/views/frontpage/_sponsor.html.erb
|
887
896
|
- app/views/frontpage/index.html.erb
|
897
|
+
- app/views/groups/_form.html.erb
|
888
898
|
- app/views/groups/_group.html.erb
|
889
899
|
- app/views/groups/_index.html.erb
|
890
|
-
- app/views/groups/
|
900
|
+
- app/views/groups/_new_modal.html.erb
|
891
901
|
- app/views/groups/_quick_search_result.html.erb
|
892
902
|
- app/views/groups/_search_result.html.erb
|
893
903
|
- app/views/groups/_show.html.erb
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
@@ -1,93 +0,0 @@
|
|
1
|
-
Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
|
2
|
-
|
3
|
-
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
4
|
-
|
5
|
-
This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
|
6
|
-
|
7
|
-
|
8
|
-
-----------------------------------------------------------
|
9
|
-
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
10
|
-
-----------------------------------------------------------
|
11
|
-
|
12
|
-
PREAMBLE
|
13
|
-
The goals of the Open Font License (OFL) are to stimulate worldwide
|
14
|
-
development of collaborative font projects, to support the font creation
|
15
|
-
efforts of academic and linguistic communities, and to provide a free and
|
16
|
-
open framework in which fonts may be shared and improved in partnership
|
17
|
-
with others.
|
18
|
-
|
19
|
-
The OFL allows the licensed fonts to be used, studied, modified and
|
20
|
-
redistributed freely as long as they are not sold by themselves. The
|
21
|
-
fonts, including any derivative works, can be bundled, embedded,
|
22
|
-
redistributed and/or sold with any software provided that any reserved
|
23
|
-
names are not used by derivative works. The fonts and derivatives,
|
24
|
-
however, cannot be released under any other type of license. The
|
25
|
-
requirement for fonts to remain under this license does not apply
|
26
|
-
to any document created using the fonts or their derivatives.
|
27
|
-
|
28
|
-
DEFINITIONS
|
29
|
-
"Font Software" refers to the set of files released by the Copyright
|
30
|
-
Holder(s) under this license and clearly marked as such. This may
|
31
|
-
include source files, build scripts and documentation.
|
32
|
-
|
33
|
-
"Reserved Font Name" refers to any names specified as such after the
|
34
|
-
copyright statement(s).
|
35
|
-
|
36
|
-
"Original Version" refers to the collection of Font Software components as
|
37
|
-
distributed by the Copyright Holder(s).
|
38
|
-
|
39
|
-
"Modified Version" refers to any derivative made by adding to, deleting,
|
40
|
-
or substituting -- in part or in whole -- any of the components of the
|
41
|
-
Original Version, by changing formats or by porting the Font Software to a
|
42
|
-
new environment.
|
43
|
-
|
44
|
-
"Author" refers to any designer, engineer, programmer, technical
|
45
|
-
writer or other person who contributed to the Font Software.
|
46
|
-
|
47
|
-
PERMISSION & CONDITIONS
|
48
|
-
Permission is hereby granted, free of charge, to any person obtaining
|
49
|
-
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
50
|
-
redistribute, and sell modified and unmodified copies of the Font
|
51
|
-
Software, subject to the following conditions:
|
52
|
-
|
53
|
-
1) Neither the Font Software nor any of its individual components,
|
54
|
-
in Original or Modified Versions, may be sold by itself.
|
55
|
-
|
56
|
-
2) Original or Modified Versions of the Font Software may be bundled,
|
57
|
-
redistributed and/or sold with any software, provided that each copy
|
58
|
-
contains the above copyright notice and this license. These can be
|
59
|
-
included either as stand-alone text files, human-readable headers or
|
60
|
-
in the appropriate machine-readable metadata fields within text or
|
61
|
-
binary files as long as those fields can be easily viewed by the user.
|
62
|
-
|
63
|
-
3) No Modified Version of the Font Software may use the Reserved Font
|
64
|
-
Name(s) unless explicit written permission is granted by the corresponding
|
65
|
-
Copyright Holder. This restriction only applies to the primary font name as
|
66
|
-
presented to the users.
|
67
|
-
|
68
|
-
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
69
|
-
Software shall not be used to promote, endorse or advertise any
|
70
|
-
Modified Version, except to acknowledge the contribution(s) of the
|
71
|
-
Copyright Holder(s) and the Author(s) or with their explicit written
|
72
|
-
permission.
|
73
|
-
|
74
|
-
5) The Font Software, modified or unmodified, in part or in whole,
|
75
|
-
must be distributed entirely under this license, and must not be
|
76
|
-
distributed under any other license. The requirement for fonts to
|
77
|
-
remain under this license does not apply to any document created
|
78
|
-
using the Font Software.
|
79
|
-
|
80
|
-
TERMINATION
|
81
|
-
This license becomes null and void if any of the above conditions are
|
82
|
-
not met.
|
83
|
-
|
84
|
-
DISCLAIMER
|
85
|
-
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
86
|
-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
87
|
-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
88
|
-
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
89
|
-
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
90
|
-
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
91
|
-
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
92
|
-
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
93
|
-
OTHER DEALINGS IN THE FONT SOFTWARE.
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-ExtraLight.otf
DELETED
Binary file
|
data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf
DELETED
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|