social_stream 2.1.1 → 2.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile +5 -2
- data/LICENSE +1 -1
- data/base/Rakefile +3 -17
- data/base/app/assets/images/flags/de.png +0 -0
- data/base/app/assets/images/flags/fr.png +0 -0
- data/base/app/assets/images/flags/hu.png +0 -0
- data/base/app/assets/images/flags/nl.png +0 -0
- data/base/app/assets/javascripts/social_stream/actor.js +34 -0
- data/base/app/assets/javascripts/social_stream/contact.js +40 -5
- data/base/app/assets/javascripts/social_stream/flash.js +6 -1
- data/base/app/assets/javascripts/social_stream/group.js +6 -5
- data/base/app/assets/javascripts/social_stream/relation_customs.js +0 -1
- data/base/app/assets/stylesheets/social_stream/base/adjust/layout/_adjust.css.sass +3 -0
- data/base/app/assets/stylesheets/social_stream/base/buttons/_buttons.scss.sass +0 -2
- data/base/app/assets/stylesheets/social_stream/base/contacts/_contacts.css.sass +1 -11
- data/base/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass +1 -29
- data/base/app/assets/stylesheets/social_stream/base/layouts/_header.css.sass +0 -1
- data/base/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass +5 -0
- data/base/app/assets/stylesheets/social_stream/base/mixins/_layout.css.sass +36 -7
- data/base/app/controllers/actors_controller.rb +25 -0
- data/base/app/controllers/contacts_controller.rb +38 -8
- data/base/app/controllers/groups_controller.rb +2 -21
- data/base/app/controllers/profiles_controller.rb +4 -0
- data/base/app/controllers/settings_controller.rb +12 -2
- data/base/app/controllers/users_controller.rb +0 -8
- data/base/app/helpers/contacts_helper.rb +8 -0
- data/base/app/models/activity.rb +19 -6
- data/base/app/models/actor.rb +49 -11
- data/base/app/models/contact.rb +12 -5
- data/base/app/models/group.rb +13 -11
- data/base/app/models/permission.rb +30 -0
- data/base/app/models/relation.rb +17 -7
- data/base/app/models/relation/custom.rb +2 -40
- data/base/app/models/relation/follow.rb +8 -2
- data/base/app/models/relation/owner.rb +10 -0
- data/base/app/models/relation/single.rb +7 -4
- data/base/app/models/site.rb +1 -1
- data/base/app/models/tie.rb +8 -4
- data/base/app/views/contacts/_add_button.html.erb +9 -0
- data/base/app/views/contacts/_button.html.erb +3 -3
- data/base/app/views/contacts/_button_multiple.html.erb +4 -0
- data/base/app/views/contacts/_button_simple.html.erb +17 -0
- data/base/app/views/contacts/_new_modal.html.erb +22 -0
- data/base/app/views/contacts/destroy.js.erb +5 -4
- data/base/app/views/contacts/update.js.erb +5 -4
- data/base/app/views/devise/confirmations/new.html.erb +14 -9
- data/base/app/views/frontpage/_presentation.html.erb +2 -2
- data/base/app/views/groups/_form.html.erb +20 -20
- data/base/app/views/groups/show.html.erb +5 -5
- data/base/app/views/layouts/_header_dropdown_menu.html.erb +3 -5
- data/base/app/views/layouts/_header_signed_in.erb +3 -3
- data/base/app/views/layouts/_logo_in.html.erb +1 -1
- data/base/app/views/layouts/application.html.erb +2 -0
- data/base/app/views/permissions/_list.html.erb +1 -1
- data/base/app/views/profiles/_avatar.html.erb +1 -5
- data/base/app/views/profiles/_avatar_edit.html.erb +5 -0
- data/base/app/views/profiles/_comunication-info.html.erb +2 -36
- data/base/app/views/profiles/_comunication-info_edit.html.erb +27 -0
- data/base/app/views/profiles/_edit_icon.html.erb +0 -1
- data/base/app/views/profiles/_experience.html.erb +1 -6
- data/base/app/views/profiles/_experience_edit.html.erb +5 -0
- data/base/app/views/profiles/_personal.html.erb +1 -39
- data/base/app/views/profiles/_personal_edit.html.erb +31 -0
- data/base/app/views/profiles/_profile_edit.html.erb +7 -0
- data/base/app/views/profiles/_tags.html.erb +1 -4
- data/base/app/views/profiles/_tags_edit.html.erb +4 -0
- data/base/app/views/profiles/edit.html.erb +24 -0
- data/base/app/views/settings/_notifications.html.erb +12 -4
- data/base/app/views/users/show.html.erb +5 -5
- data/base/config/locales/de.yml +654 -0
- data/base/config/locales/en.yml +20 -9
- data/base/config/locales/es.yml +151 -140
- data/base/config/locales/fr.yml +656 -0
- data/base/config/locales/hu.yml +653 -0
- data/base/config/locales/nl.yml +656 -0
- data/base/config/locales/pt.yml +250 -239
- data/base/config/locales/rails.de.yml +203 -0
- data/base/config/locales/rails.fr.yml +222 -0
- data/base/config/locales/rails.hu.yml +199 -0
- data/base/config/locales/rails.nl.yml +199 -0
- data/base/config/locales/zh.yml +214 -202
- data/base/config/routes.rb +22 -30
- data/base/db/migrate/20130708152633_set_group_owners.rb +19 -0
- data/base/db/migrate/20130723133530_actor_notification_settings.rb +10 -0
- data/base/lib/generators/social_stream/base/templates/initializer.rb +13 -7
- data/base/lib/rails/social_stream.rb +2 -0
- data/base/lib/social_stream/base.rb +27 -7
- data/base/lib/social_stream/base/ability.rb +3 -5
- data/base/lib/social_stream/base/autoload.rb +1 -0
- data/base/lib/social_stream/base/version.rb +1 -1
- data/base/lib/social_stream/controllers/authorship.rb +18 -0
- data/base/lib/social_stream/controllers/helpers.rb +18 -4
- data/base/lib/social_stream/controllers/objects.rb +2 -8
- data/base/lib/social_stream/controllers/subjects.rb +9 -2
- data/base/lib/social_stream/models/supertype.rb +2 -0
- data/base/lib/social_stream/population/activity_object.rb +6 -8
- data/base/lib/social_stream/routing/mapper.rb +52 -0
- data/base/social_stream-base.gemspec +4 -7
- data/base/spec/controllers/groups_controller_spec.rb +19 -8
- data/base/spec/controllers/posts_controller_spec.rb +114 -147
- data/base/spec/models/post_authorization_spec.rb +190 -204
- data/base/spec/models/post_spec.rb +17 -63
- data/base/vendor/assets/javascripts/bootstrap-multiselect.js +434 -127
- data/documents/Rakefile +1 -6
- data/documents/config/locales/de.yml +93 -0
- data/documents/config/locales/es.yml +2 -2
- data/documents/config/locales/fr.yml +93 -0
- data/documents/config/locales/hu.yml +93 -0
- data/documents/config/locales/nl.yml +93 -0
- data/documents/config/locales/zh.yml +4 -4
- data/documents/config/routes.rb +7 -9
- data/documents/lib/social_stream/documents/version.rb +1 -1
- data/documents/social_stream-documents.gemspec +4 -4
- data/events/Rakefile +1 -6
- data/events/config/locales/es.yml +3 -3
- data/events/config/locales/zh.yml +3 -3
- data/events/lib/social_stream/events/models/actor.rb +2 -1
- data/events/lib/social_stream/events/version.rb +1 -1
- data/events/social_stream-events.gemspec +1 -1
- data/lib/generators/social_stream/install_generator.rb +1 -0
- data/lib/social_stream.rb +1 -0
- data/lib/social_stream/version.rb +1 -1
- data/lib/tasks/i18n.rake +22 -2
- data/linkser/Rakefile +1 -6
- data/linkser/config/locales/de.yml +17 -0
- data/linkser/config/locales/es.yml +2 -2
- data/linkser/config/locales/fr.yml +17 -0
- data/linkser/config/locales/hu.yml +17 -0
- data/linkser/config/locales/nl.yml +17 -0
- data/linkser/config/locales/zh.yml +2 -2
- data/linkser/lib/social_stream/linkser/version.rb +1 -1
- data/linkser/social_stream-linkser.gemspec +1 -1
- data/oauth2_server/Rakefile +1 -6
- data/oauth2_server/app/assets/images/step_1.png +0 -0
- data/oauth2_server/app/assets/images/step_2.png +0 -0
- data/oauth2_server/app/assets/images/step_3.png +0 -0
- data/oauth2_server/app/assets/javascripts/social_stream/site_client.js +27 -0
- data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/applications/layout/_applications-oauth2server.css.sass +0 -5
- data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/create/layout/_create-oauth2server.css.sass +3 -5
- data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/show/layout/_show-oauth2server.css.sass +8 -6
- data/oauth2_server/app/controllers/site/clients_controller.rb +17 -41
- data/oauth2_server/app/decorators/social_stream/base/relation_decorator.rb +2 -0
- data/oauth2_server/app/decorators/social_stream/base/user_decorator.rb +1 -20
- data/oauth2_server/app/models/relation/manager.rb +1 -10
- data/oauth2_server/app/models/site/client.rb +4 -2
- data/oauth2_server/app/views/site/clients/_destroy.html.erb +11 -0
- data/oauth2_server/app/views/site/clients/_edit.html.erb +9 -2
- data/oauth2_server/app/views/site/clients/_edit_step_2.html.erb +6 -6
- data/oauth2_server/app/views/site/clients/_edit_step_3.html.erb +8 -6
- data/oauth2_server/app/views/site/clients/_form.html.erb +11 -11
- data/oauth2_server/app/views/site/clients/_list.html.erb +23 -11
- data/oauth2_server/app/views/site/clients/edit.html.erb +1 -1
- data/oauth2_server/app/views/site/clients/index.html.erb +9 -40
- data/oauth2_server/app/views/site/clients/show.html.erb +66 -68
- data/oauth2_server/config/locales/en.yml +19 -0
- data/oauth2_server/config/locales/es.yml +23 -4
- data/oauth2_server/config/locales/zh.yml +32 -13
- data/oauth2_server/config/routes.rb +3 -1
- data/oauth2_server/lib/social_stream/oauth2_server.rb +4 -1
- data/oauth2_server/lib/social_stream/oauth2_server/ability.rb +1 -1
- data/oauth2_server/lib/social_stream/oauth2_server/models/user.rb +18 -0
- data/oauth2_server/lib/social_stream/oauth2_server/version.rb +1 -1
- data/oauth2_server/social_stream-oauth2_server.gemspec +1 -1
- data/oauth2_server/spec/controllers/site_clients_controller_authorization_spec.rb +7 -0
- data/ostatus/Rakefile +1 -6
- data/ostatus/config/locales/zh.yml +8 -8
- data/ostatus/lib/social_stream-ostatus.rb +3 -0
- data/ostatus/lib/social_stream/ostatus/version.rb +1 -1
- data/ostatus/social_stream-ostatus.gemspec +1 -1
- data/places/config/locales/es.yml +51 -51
- data/presence/config/locales/es.yml +48 -48
- data/presence/config/locales/zh.yml +48 -48
- data/presence/lib/social_stream/presence/version.rb +1 -1
- data/presence/social_stream-presence.gemspec +1 -1
- data/social_stream.gemspec +8 -7
- metadata +60 -29
- data/base/app/assets/javascripts/social_stream/follow.js +0 -28
- data/base/app/controllers/followers_controller.rb +0 -34
- data/base/app/helpers/followers_helper.rb +0 -5
- data/base/app/views/contacts/_link_follow.html.erb +0 -16
- data/base/app/views/followers/destroy.js.erb +0 -1
- data/base/app/views/followers/index.html.erb +0 -30
- data/base/app/views/followers/update.js.erb +0 -3
- data/base/app/views/frontpage/_characteristics.html.erb +0 -23
- data/base/lib/social_stream/routing/constraints/custom.rb +0 -11
- data/base/lib/social_stream/routing/constraints/follow.rb +0 -11
- data/base/spec/controllers/followers_controller_spec.rb +0 -37
@@ -1,28 +0,0 @@
|
|
1
|
-
//= require social_stream/callback
|
2
|
-
|
3
|
-
SocialStream.Follow = (function(SS, $, undefined){
|
4
|
-
var callback = new SS.Callback();
|
5
|
-
|
6
|
-
var initButtons = function(){
|
7
|
-
$(".following-button").mouseenter(function(){
|
8
|
-
$(this).hide();
|
9
|
-
$(this).siblings(".unfollow-button").show();
|
10
|
-
});
|
11
|
-
|
12
|
-
$(".unfollow-button").mouseleave(function(){
|
13
|
-
$(this).hide();
|
14
|
-
$(this).siblings(".following-button").show();
|
15
|
-
});
|
16
|
-
|
17
|
-
$(".unfollow-button").hide();
|
18
|
-
}
|
19
|
-
|
20
|
-
callback.register('index', initButtons);
|
21
|
-
|
22
|
-
$(function(){
|
23
|
-
SocialStream.Follow.index();
|
24
|
-
});
|
25
|
-
|
26
|
-
return callback.extend({
|
27
|
-
});
|
28
|
-
})(SocialStream, jQuery);
|
@@ -1,34 +0,0 @@
|
|
1
|
-
class FollowersController < ApplicationController
|
2
|
-
before_filter :authenticate_user!, :except => :index
|
3
|
-
|
4
|
-
respond_to :html, :js
|
5
|
-
|
6
|
-
def index
|
7
|
-
@followings = current_subject.following_actor_objects.includes(:actor)
|
8
|
-
@followers = current_subject.followers
|
9
|
-
|
10
|
-
respond_to do |format|
|
11
|
-
format.html
|
12
|
-
format.json { render :text => to_json(@followers) }
|
13
|
-
end
|
14
|
-
end
|
15
|
-
|
16
|
-
def update
|
17
|
-
current_contact.relation_ids = Array.wrap(Relation::Follow.instance.id)
|
18
|
-
|
19
|
-
respond_to :js
|
20
|
-
end
|
21
|
-
|
22
|
-
def destroy
|
23
|
-
current_contact.relation_ids = Array.new
|
24
|
-
|
25
|
-
respond_to :js
|
26
|
-
end
|
27
|
-
|
28
|
-
private
|
29
|
-
|
30
|
-
def current_contact
|
31
|
-
@contact ||=
|
32
|
-
current_subject.sent_contacts.find params[:id]
|
33
|
-
end
|
34
|
-
end
|
@@ -1,16 +0,0 @@
|
|
1
|
-
<div class="<%= follow_link_class contact %>">
|
2
|
-
<% if contact.sent? %>
|
3
|
-
<div class="following-button">
|
4
|
-
<%= t 'contact.following' %>
|
5
|
-
</div>
|
6
|
-
<div class="unfollow-button">
|
7
|
-
<%= form_tag follower_path(contact), :method => :delete, :remote => true do |f| %>
|
8
|
-
<%= submit_tag t('contact.unfollow') %>
|
9
|
-
<% end %>
|
10
|
-
</div>
|
11
|
-
<% else %>
|
12
|
-
<%= form_tag follower_path(contact), :method => :put, :remote => true do |f| %>
|
13
|
-
<%= submit_tag t('contact.follow') %>
|
14
|
-
<% end %>
|
15
|
-
<% end %>
|
16
|
-
</div>
|
@@ -1 +0,0 @@
|
|
1
|
-
$(".<%= follow_link_class @contact %>").html("<%= escape_javascript render(:partial => "contacts/link_follow", :locals => { :contact => @contact.reload } )%>");
|
@@ -1,30 +0,0 @@
|
|
1
|
-
<section id="followers">
|
2
|
-
<%= render partial: 'toolbar/profile', locals: { :subject => current_subject } %>
|
3
|
-
|
4
|
-
<section class="followers tabbable">
|
5
|
-
<ul class="nav nav-tabs">
|
6
|
-
<li class="active">
|
7
|
-
<a data-toggle="tab" href="#following"><%=t('follow.followings')%></a>
|
8
|
-
</li>
|
9
|
-
<li class="">
|
10
|
-
<a data-toggle="tab" href="#follower"><%=t('follow.followers')%></a>
|
11
|
-
</li>
|
12
|
-
</ul>
|
13
|
-
<div class="tab-content">
|
14
|
-
<div id="following" class="tab-pane active offset1">
|
15
|
-
<%= render @followings.
|
16
|
-
page(params[:page]).
|
17
|
-
per(20).
|
18
|
-
map { |f| current_subject.contact_to!(f) } %>
|
19
|
-
</div>
|
20
|
-
<div id="follower" class="tab-pane offset1 ">
|
21
|
-
<%= render @followers.
|
22
|
-
page(params[:page]).
|
23
|
-
per(20).
|
24
|
-
map { |f| current_subject.contact_to!(f) } %>
|
25
|
-
</div>
|
26
|
-
</div>
|
27
|
-
</section>
|
28
|
-
|
29
|
-
<%= render partial: 'sidebar/show' %>
|
30
|
-
</section>
|
@@ -1,23 +0,0 @@
|
|
1
|
-
<article id="characteristics">
|
2
|
-
<ul class="list">
|
3
|
-
<li class="list participants">
|
4
|
-
<%= t('frontpage.elements.participants') %>
|
5
|
-
</li>
|
6
|
-
<li class="list organizers">
|
7
|
-
<%= t('frontpage.elements.organizers') %>
|
8
|
-
</li>
|
9
|
-
<li class="list groups">
|
10
|
-
<%= t('frontpage.elements.groups') %>
|
11
|
-
</li>
|
12
|
-
<li class="list comments">
|
13
|
-
<%= t('frontpage.elements.comments') %>
|
14
|
-
</li>
|
15
|
-
<li class="list tags">
|
16
|
-
<%= t('frontpage.elements.tags') %>
|
17
|
-
</li>
|
18
|
-
<li class="list networks">
|
19
|
-
<%= t('frontpage.elements.networks') %>
|
20
|
-
</li>
|
21
|
-
</ul>
|
22
|
-
</article>
|
23
|
-
|
@@ -1,37 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
|
3
|
-
describe FollowersController do
|
4
|
-
include SocialStream::TestHelpers::Controllers
|
5
|
-
|
6
|
-
render_views
|
7
|
-
|
8
|
-
describe "with followers" do
|
9
|
-
before do
|
10
|
-
@user = Factory(:user)
|
11
|
-
|
12
|
-
@follow = Factory(:follow, :contact => Factory(:contact, :sender => @user.actor))
|
13
|
-
|
14
|
-
sign_in @user
|
15
|
-
end
|
16
|
-
|
17
|
-
it "should render index" do
|
18
|
-
get :index
|
19
|
-
|
20
|
-
response.should be_success
|
21
|
-
end
|
22
|
-
|
23
|
-
describe "with post" do
|
24
|
-
before do
|
25
|
-
Factory(:self_post, :author_id => @user.actor_id)
|
26
|
-
end
|
27
|
-
|
28
|
-
it "should render index" do
|
29
|
-
get :index
|
30
|
-
|
31
|
-
response.should be_success
|
32
|
-
end
|
33
|
-
end
|
34
|
-
end
|
35
|
-
end
|
36
|
-
|
37
|
-
|