merging with master

Leandro Santos
2 parents 2d0e1564 076e26f5
Showing 243 changed files with 20811 additions and 7539 deletions Show diff stats
INSTALL.https.md
INSTALL.md
app/controllers/admin/admin_panel_controller.rb
app/controllers/admin/organizations_controller.rb
app/controllers/my_profile/tasks_controller.rb
app/controllers/public/chat_controller.rb
app/helpers/application_helper.rb
app/helpers/boxes_helper.rb
app/helpers/chat_helper.rb
app/helpers/profile_editor_helper.rb
app/helpers/search_helper.rb
app/helpers/users_helper.rb
app/models/article.rb
app/models/block.rb
app/models/chat_message.rb
app/models/comment.rb
app/models/environment.rb
app/models/person.rb
app/models/product_category.rb
app/models/profile.rb
@@ -11,8 +11,8 @@ as below:
  
     # mkdir /etc/noosfero/ssl
     # cd /etc/noosfero/ssl
-	  # openssl genrsa 1024 > noosfero.key
-    # openssl req -new -x509 -nodes -sha1 -days $[10*365] -key noosfero.key > noosfero.cert
+    # openssl genrsa 2048 > noosfero.key
+    # openssl req -new -x509 -sha256 -nodes -days $[10*365] -key noosfero.key > noosfero.cert
     # cat noosfero.key noosfero.cert > noosfero.pem
  
 ## Web server configuration
@@ -74,7 +74,7 @@ downloading from git
  
 Here we are cloning the noosfero repository from git. Note: you will need to install git before.
  
-    $ git clone git://gitorious.org/noosfero/noosfero.git current
+    $ git clone https://gitlab.com/noosfero/noosfero.git current
     $ cd current
     $ git checkout -b stable origin/stable
  
@@ -71,22 +71,4 @@ class AdminPanelController &lt; AdminController
       end
     end
   end
-
-  def manage_organizations_status
-    scope = environment.organizations
-    @filter = params[:filter] || 'any'
-    @title = "Organization profiles"
-    @title = @title+" - "+@filter if @filter != 'any'
-
-    if @filter == 'enabled'
-      scope = scope.visible
-    elsif @filter == 'disabled'
-      scope = scope.disabled
-    end
-
-    scope = scope.order('name ASC')
-
-    @q = params[:q]
-    @collection = find_by_contents(:organizations, environment, scope, @q, {:per_page => 10, :page => params[:npage]})[:results]
-  end
 end
@@ -0,0 +1,66 @@
+class OrganizationsController < AdminController
+
+  protect 'manage_environment_organizations', :environment
+
+  def index
+    @filter = params[:filter] || 'any'
+    @title = _('Organization profiles')
+    @type = params[:type] || "any"
+    @types_filter = [[_('All'), 'any'], [_('Community'), 'Community'], [_('Enterprise'), 'Enterprise']]
+    @types_filter = @types_filter | @plugins.dispatch(:organization_types_filter_options)
+
+    scope = @plugins.dispatch_first(:filter_manage_organization_scope, @type)
+    if scope.blank?
+      scope = environment.organizations
+      scope = scope.where(:type => @type) if @type != 'any'
+    end
+
+    if @filter == 'enabled'
+      scope = scope.visible
+    elsif @filter == 'disabled'
+      scope = scope.disabled
+    end
+
+    scope = scope.order('name ASC')
+
+    @q = params[:q]
+    @collection = find_by_contents(:organizations, environment, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
+  end
+
+  def activate
+    organization = environment.organizations.find(params[:id])
+    if organization.enable
+      render :text => (_('%s enabled') % organization.name).to_json
+    else
+      render :text => (_('%s could not be enabled') % organization.name).to_json
+    end
+  end
+
+  def deactivate
+    organization = environment.organizations.find(params[:id])
+    if organization.disable
+      render :text => (_('%s disabled') % organization.name).to_json
+    else
+      render :text => (_('%s could not be disable') % organization.name).to_json
+    end
+  end
+
+  def destroy
+    if request.post?
+      organization = environment.organizations.find(params[:id])
+      if organization && organization.destroy
+        render :text => (_('%s removed') % organization.name).to_json
+      else
+        render :text => (_('%s could not be removed') % organization.name).to_json
+      end
+    else
+      render :nothing => true
+    end
+  end
+
+  private
+
+  def per_page
+    10
+  end
+end
@@ -14,7 +14,7 @@ class TasksController &lt; MyProfileController
  
     @failed = params ? params[:failed] : {}
  
-    @responsible_candidates = profile.members.by_role(profile.roles.reject {|r| !r.has_permission?('perform_task')})
+    @responsible_candidates = profile.members.by_role(profile.roles.reject {|r| !r.has_permission?('perform_task')}) if profile.organization?
   end
  
   def processed
@@ -2,6 +2,7 @@ class ChatController &lt; PublicController
  
   before_filter :login_required
   before_filter :check_environment_feature
+  before_filter :can_send_message, :only => :register_message
  
   def start_session
     login = user.jid
@@ -54,6 +55,16 @@ class ChatController &lt; PublicController
     end
   end
  
+  def avatars
+    profiles = environment.profiles.where(:identifier => params[:profiles])
+    avatar_map = profiles.inject({}) do |result, profile|
+      result[profile.identifier] = profile_icon(profile, :minor)
+      result
+    end
+
+    render_json avatar_map
+  end
+
   def update_presence_status
     if request.xhr?
       current_user.update_attributes({:chat_status_at => DateTime.now}.merge(params[:status] || {}))
@@ -62,11 +73,17 @@ class ChatController &lt; PublicController
   end
  
   def save_message
-    to = environment.profiles.find_by_identifier(params[:to])
-    body = params[:body]
-
-    ChatMessage.create!(:to => to, :from => user, :body => body)
-    render :text => 'ok'
+    if request.post?
+      to = environment.profiles.where(:identifier => params[:to]).first
+      body = params[:body]
+
+      begin
+        ChatMessage.create!(:to => to, :from => user, :body => body)
+        return render_json({:status => 0})
+      rescue Exception => exception
+        return render_json({:status => 3, :message => exception.to_s, :backtrace => exception.backtrace})
+      end
+    end
   end
  
   def recent_messages
@@ -90,8 +107,9 @@ class ChatController &lt; PublicController
   end
  
   def recent_conversations
-    conversations_order = ActiveRecord::Base.connection.execute("select profiles.identifier from profiles inner join (select distinct r.id as id, MAX(r.created_at) as created_at from (select from_id, to_id, created_at, (case when from_id=#{user.id} then to_id else from_id end) as id from chat_messages where from_id=#{user.id} or to_id=#{user.id}) as r group by id order by created_at desc, id) as t on profiles.id=t.id order by t.created_at desc").entries.map {|e| e['identifier']}
-    render :json => {:order => conversations_order.reverse, :domain => environment.default_hostname.gsub('.','-')}.to_json
+    profiles = Profile.find_by_sql("select profiles.* from profiles inner join (select distinct r.id as id, MAX(r.created_at) as created_at from (select from_id, to_id, created_at, (case when from_id=#{user.id} then to_id else from_id end) as id from chat_messages where from_id=#{user.id} or to_id=#{user.id}) as r group by id order by created_at desc, id) as t on profiles.id=t.id order by t.created_at desc")
+    jids = profiles.map(&:jid).reverse
+    render :json => jids.to_json
   end
  
   #TODO Ideally this is done through roster table on ejabberd.
@@ -108,4 +126,14 @@ class ChatController &lt; PublicController
     end
   end
  
+  def can_send_message
+    return render_json({:status => 1, :message => 'Missing parameters!'}) if params[:from].nil? || params[:to].nil? || params[:message].nil?
+    return render_json({:status => 2, :message => 'You can not send message as another user!'}) if params[:from] != user.jid
+    # TODO Maybe register the jid in a table someday to avoid this below
+    return render_json({:status => 3, :messsage => 'You can not send messages to strangers!'}) if user.friends.where(:identifier => params[:to].split('@').first).blank?
+  end
+
+  def render_json(result)
+    render :text => result.to_json
+  end
 end
@@ -881,7 +881,7 @@ module ApplicationHelper
       field_html += capture(&block)
     end
  
-    if controller.action_name == 'signup' || controller.action_name == 'new_community' || (controller.controller_name == "enterprise_registration" && controller.action_name == 'index')
+    if controller.action_name == 'signup' || controller.action_name == 'new_community' || (controller.controller_name == "enterprise_registration" && controller.action_name == 'index') || (controller.controller_name == 'home' && controller.action_name == 'index' && user.nil?)
       if profile.signup_fields.include?(name)
         result = field_html
       end
@@ -122,7 +122,7 @@ module BoxesHelper
   end
  
   def wrap_main_content(content)
-    (1..8).to_a.reverse.inject(content) { |acc,n| content_tag('div', acc, :id => 'main-content-wrapper-' + n.to_s) }
+    content_tag('div', content, :class => 'main-content')
   end
  
   def extract_block_content(content)
@@ -9,12 +9,12 @@ module ChatHelper
     avatar = profile_image(user, :portrait, :class => 'avatar')
     content_tag('span',
       link_to(avatar + content_tag('span', user.name) + ui_icon('ui-icon-triangle-1-s'),
-        '#',
+        '',
         :onclick => 'toggleMenu(this); return false',
         :class => icon_class + ' simplemenu-trigger'
       ) +
       content_tag('ul',
-        links.map{|link| content_tag('li', link_to(link[1], '#', :class => link[0], :id => link[2], 'data-jid' => user.jid), :class => 'simplemenu-item') }.join("\n"),
+        links.map{|link| content_tag('li', link_to(link[1], '', :class => link[0], :id => link[2], 'data-jid' => user.jid), :class => 'simplemenu-item') }.join("\n"),
         :style => 'display: none; z-index: 100',
         :class => 'simplemenu-submenu'
       ),
@@ -141,8 +141,9 @@ module ProfileEditorHelper
     )
   end
  
-  def control_panel_button(title, icon, url)
-    link_to title, url, :class => 'control-panel-%s' % icon
+  def control_panel_button(title, icon, url, html_options = {})
+    html_options ||= {}
+    link_to title, url, html_options.merge(:class => 'control-panel-%s' % icon)
   end
  
   def unchangeable_privacy_field(profile)
@@ -106,6 +106,10 @@ module SearchHelper
     end
   end
  
+  def city_with_state_for_profile(p)
+    city_with_state(p.region) || [p.city, p.state].compact.reject(&:blank?).join(', ')
+  end
+
   def display_selector(asset, display, float = 'right')
     display = nil if display.blank?
     display ||= asset_class(asset).default_search_display
@@ -14,7 +14,7 @@ module UsersHelper
     select_field = select_tag(:filter, options, :onchange => onchange)
     content_tag('div',
       content_tag('strong', _('Filter')) + ': ' + select_field,
-      :class => "environment-users-customize-search"
+      :class => "environment-profiles-customize-search"
     )
   end
  
@@ -96,6 +96,8 @@ class Article &lt; ActiveRecord::Base
   belongs_to :translation_of, :class_name => 'Article', :foreign_key => :translation_of_id
   before_destroy :rotate_translations
  
+  acts_as_voteable
+
   before_create do |article|
     article.published_at ||= Time.now
     if article.reference_article && !article.parent
@@ -2,7 +2,7 @@ class Block &lt; ActiveRecord::Base
  
   attr_accessible :title, :display, :limit, :box_id, :posts_per_page,
                   :visualization_format, :language, :display_user,
-                  :box, :edit_modes, :move_modes
+                  :box, :edit_modes, :move_modes, :mirror
  
   # to be able to generate HTML
   include ActionView::Helpers::UrlHelper
@@ -15,11 +15,23 @@ class Block &lt; ActiveRecord::Base
  
   acts_as_list :scope => :box
   belongs_to :box
+  belongs_to :mirror_block, :class_name => "Block"
+  has_many :observers, :class_name => "Block", :foreign_key => "mirror_block_id"
  
   acts_as_having_settings
  
   scope :enabled, :conditions => { :enabled => true }
  
+  after_save do |block|
+    if block.owner.kind_of?(Profile) && block.owner.is_template? && block.mirror?
+      block.observers.each do |observer|
+        observer.copy_from(block)
+        observer.title = block.title
+        observer.save
+      end
+    end
+  end
+
   def embedable?
     false
   end
@@ -299,6 +311,10 @@ class Block &lt; ActiveRecord::Base
     self.position = block.position
   end
  
+  def add_observer(block)
+    self.observers << block
+  end
+
   private
  
   def home_page_path
@@ -4,4 +4,5 @@ class ChatMessage &lt; ActiveRecord::Base
   belongs_to :to, :class_name => 'Profile'
   belongs_to :from, :class_name => 'Profile'
  
+  validates_presence_of :from, :to
 end
@@ -48,6 +48,8 @@ class Comment &lt; ActiveRecord::Base
  
   xss_terminate :only => [ :body, :title, :name ], :on => 'validation'
  
+  acts_as_voteable
+
   def comment_root
     (reply_of && reply_of.comment_root) || self
   end
@@ -29,6 +29,7 @@ class Environment &lt; ActiveRecord::Base
     'manage_environment_roles' => N_('Manage environment roles'),
     'manage_environment_validators' => N_('Manage environment validators'),
     'manage_environment_users' => N_('Manage environment users'),
+    'manage_environment_organizations' => N_('Manage environment organizations'),
     'manage_environment_templates' => N_('Manage environment templates'),
     'manage_environment_licenses' => N_('Manage environment licenses'),
     'manage_environment_trusted_sites' => N_('Manage environment trusted sites'),
@@ -111,6 +111,8 @@ roles] }
  
   belongs_to :user, :dependent => :delete
  
+  acts_as_voter
+
   def can_change_homepage?
     !environment.enabled?('cant_change_homepage') || is_admin?
   end
@@ -10,6 +10,9 @@ class ProductCategory &lt; Category
     :joins => :products,
     :conditions => ['products.profile_id = ?', enterprise.id]
   }}
+  scope :by_environment, lambda { |environment| {
+    :conditions => ['environment_id = ?', environment.id]
+  }}
   scope :unique_by_level, lambda { |level| {
     :select => "DISTINCT ON (filtered_category) split_part(path, '/', #{level}) AS filtered_category, categories.*"
   }}
@@ -430,6 +430,9 @@ class Profile &lt; ActiveRecord::Base
         new_block = block.class.new(:title => block[:title])
         new_block.copy_from(block)
         new_box.blocks << new_block
+        if block.mirror?
+          block.add_observer(new_block)
+        end
       end
     end
   end
@@ -1002,11 +1005,19 @@ private :generate_url, :url_options
     self.save
   end
  
+  def disabled?
+    !visible
+  end
+
   def enable
     self.visible = true
     self.save
   end
  
+  def enabled?
+    visible
+  end
+
   def control_panel_settings_button
     {:title => _('Edit Profile'), :icon => 'edit-profile'}
   end
@@ -19,9 +19,9 @@
 <table>
   <tr><td><%= link_to _('User roles'), :controller => 'role' %></td></tr>
   <tr><td><%= link_to _('Users'), :controller => 'users' %></td></tr>
+  <tr><td><%= link_to _('Organizations'), :controller => 'organizations' %></td></tr>
   <tr><td><%= link_to _('Profile templates'), :controller => 'templates' %></td></tr>
   <tr><td><%= link_to _('Fields'), :controller => 'features', :action => 'manage_fields' %></td></tr>
-  <tr><td><%= link_to _('Manage organizations status'), :action => 'manage_organizations_status' %></td></tr>
 </table>
  
  
@@ -1,69 +0,0 @@
-<h1><%= _('Manage organizations') %></h1>
-
-<%= form_tag( { :action => 'manage_organizations_status' }, :method => 'get', :class => 'users-search' ) do %>
-
-  <div class="search-field">
-    <span class="formfield">
-      <%= text_field_tag 'q', @q, :title => _("Find profiles"), :style=>"width:85%" %>
-    </span>
-
-    <%= submit_button(:search, _('Search')) %>
-  </div>
-
-  <div class="environment-users-results-header">
-    <div id='environment-users-filter-title'><%= @title %></div>
-
-    <div id="environment-users-filter-filter">
-      <strong><%= _("Filter by: ") %></strong>
-
-      <select id="profile_filter_select">
-        <%= options_for_select([['Any', 'any'],["Disabled profiles", "disabled"], ["Enabled profiles", "enabled"]], @filter) %>
-      </select>
-    </div>
-    <div style="clear: both"></div>
-  </div>
-
-  <table>
-    <colgroup>
-      <col width="80%">
-      <col width="20%">
-    </colgroup>
-
-    <tr>
-      <th><%= _('Member') %></th>
-      <th><%= _('Actions') %></th>
-    </tr>
-
-    <% @collection.each do |p| %>
-      <tr title="<%= p.name %>">
-        <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
-
-        <td class='actions'>
-          <div class="members-buttons-cell">
-            <% if p.visible %>
-              <%= button_without_text :'deactivate-user', _('Deactivate'), {:controller => "profile_editor", :action => 'deactivate_profile', :profile => p.identifier, :id => p.id}, :confirm => _("Do you want to deactivate this profile ?") %>
-            <% else %>
-              <%= button_without_text :'activate-user', _('Activate'), {:controller => "profile_editor", :action => 'activate_profile', :profile => p.identifier, :id => p.id}, :confirm => _("Do you want to activate this profile ?") %>
-            <% end %>
-              <%= button_without_text :'delete', _('Remove'), {:controller => "profile_editor", :action => 'destroy_profile', :profile => p.identifier, :id => p.id, :return_to => "/admin/admin_panel/manage_organizations_status"}, :method => :post, :confirm => _("Do you want to deactivate this profile ?") %>
-         </div>
-        </td>
-      </tr>
-    <% end %>
-  </table>
-
-<% end %>
-
-<%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
-
-<% button_bar do %>
-  <%= button :back, _('Back'), :controller => 'admin_panel' %>
-<% end %>
-
-<script type="text/javascript">
-  jQuery(document).ready(function(){
-    jQuery("#profile_filter_select").change(function(){
-      document.location.href = '/admin/admin_panel/manage_organizations_status?filter='+this.value;
-    });
-  });
-</script>
 \ No newline at end of file
@@ -0,0 +1,2 @@
+<li><%= report_abuse(profile, :button) %></li>
+<%= render_environment_features(:profile_actions) %></li>
@@ -13,8 +13,6 @@
       </li>
     <% end %>
  
-    <li><%= report_abuse(profile, :button) %></li>
-
-    <%= render_environment_features(:profile_actions) %>
+    <%= render :partial => 'blocks/profile_info_actions/common' %>
   <% end %>
 </ul>
@@ -8,5 +8,5 @@
       <li><%= button(:'menu-mail', _('Send an e-mail'), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button'} ) %></li>
   <% end %>
  
-  <li><%= report_abuse(profile, :button) %></li>
+    <%= render :partial => 'blocks/profile_info_actions/common' %>
 </ul>
@@ -11,6 +11,6 @@
       <li><%= button(:back, _('Send an e-mail'), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}) %></li>
     <% end %>
  
-    <li><%= report_abuse(profile, :button) %></li>
+    <%= render :partial => 'blocks/profile_info_actions/common' %>
   <% end %>
 </ul>
@@ -25,6 +25,11 @@
       </div>
       <div class="move-modes">
         <%= labelled_form_field _('Move options:'), select_tag('block[move_modes]', options_from_collection_for_select(@block.move_block_options, :first, :last, @block.move_modes)) %>
+    <% end %>
+
+    <% if @block.owner.kind_of?(Profile) && @block.owner.is_template? %>
+      <div class="mirror_block">
+        <%= labelled_check_box(_("Mirror"), "block[mirror]", value = "1", checked = @block.mirror) %>
       </div>
     <% end %>
  
 <p>
 <%= ui_icon('ui-icon-alert') %>
-<%= _('Could not connect to chat') %>, <a id='chat-retry' href='#' data-jid='<%= user.jid %>'><%= _('try again') %></a>.
+<%= _('Could not connect to chat') %>, <a id='chat-retry' href='' data-jid='<%= user.jid %>'><%= _('try again') %></a>.
 </p>
@@ -0,0 +1,41 @@
+<div class='results'>
+  <table id='organizations-list'>
+    <colgroup>
+      <col width="60%">
+      <col width="20%">
+      <col width="20%">
+    </colgroup>
+
+    <tr>
+      <th><%= _('Profile') %></th>
+      <th><%= _('Actions') %></th>
+      <th><%= _('Type') %>
+
+      <%= select_tag(:type, options_for_select(@types_filter, @type)) %>
+      </th>
+    </tr>
+
+    <% @collection.each do |p| %>
+      <tr title="<%= p.name %>">
+        <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
+
+        <td class='actions'>
+          <div class="members-buttons-cell">
+            <% if p.visible %>
+              <%= button_without_text :'deactivate-user', _('Deactivate'), {:action => 'deactivate', :id => p.id}, :class => 'action', 'data-confirm' => _("Do you want to deactivate this organization?") %>
+            <% else %>
+              <%= button_without_text :'activate-user', _('Activate'), {:action => 'activate', :id => p.id}, :class => 'action', 'data-confirm' => _("Do you want to activate this organization?") %>
+            <% end %>
+            <%= button_without_text :'delete', _('Remove'), {:action => 'destroy', :id => p.id}, :class => 'action', 'data-method' => :post, 'data-confirm' => _("Do you want to destroy this organization?") %>
+         </div>
+        </td>
+
+        <td> <%= _("#{p.type}") %> </td>
+      </tr>
+    <% end %>
+  </table>
+
+  <div>
+    <%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
+  </div>
+</div>
@@ -0,0 +1,30 @@
+<h1><%= _('Organizations') %></h1>
+
+<%= form_tag( { :action => 'index' }, :method => 'get', :id => 'manage-profiles' ) do %>
+
+  <div class="search-field">
+    <span class="formfield">
+      <%= text_field_tag 'q', @q, :title => _('Find organizations'), :style=>"width:85%" %>
+    </span>
+
+    <%= submit_button(:search, _('Search')) %>
+  </div>
+
+  <div class="environment-profiles-results-header">
+    <div id='environment-profiles-filter-title'><%= @title %></div>
+
+    <div id="environment-profiles-filter-filter">
+      <strong><%= _("Filter by: ") %></strong>
+      <%= select_tag(:filter, options_for_select([[_('Any'), 'any'],[_('Disabled'), "disabled"], [_('Enabled') , "enabled"]], @filter)) %>
+    </div>
+    <div style="clear: both"></div>
+  </div>
+
+  <%= render :partial => 'results' %>
+
+  <% button_bar do %>
+    <%= button :back, _('Back'), :controller => 'admin_panel' %>
+  <% end %>
+<% end %>
+
+<%= javascript_include_tag 'manage-organizations' %>
@@ -0,0 +1 @@
+../../views/shared/admin/profiles/index.js.rb
 \ No newline at end of file
@@ -73,7 +73,7 @@
   <%= control_panel_button(_('Edit welcome page'), 'welcome-page', :action => 'welcome_page') if has_welcome_page %>
  
   <% @plugins.dispatch(:control_panel_buttons).each do |button| %>
-    <%= control_panel_button(button[:title], button[:icon], button[:url]) %>
+    <%= control_panel_button(button[:title], button[:icon], button[:url], button[:html_options]) %>
   <% end %>
  
 <% end %>
@@ -0,0 +1 @@
+jQuery('#manage-profiles .results').replaceWith('<%= escape_javascript(render 'results') %>');
@@ -7,13 +7,13 @@
       var $own_name = '<%= user.name %>';
       var $muc_domain = '<%= "conference.#{environment.default_hostname}" %>';
       var $bosh_service = '//<%= environment.default_hostname %>/http-bind';
-      var $user_unavailable_error = '<%= _("<strong>ooops!</strong> The message could not be sent because the user is not online") %>';
+      var $user_unavailable_error = '<%= _("The user is not online now. He/She will receive these messages as soon as he/she gets online.") %>';
       var $update_presence_status_every = <%= User.expires_chat_status_every.minutes %>;
       var $presence = '<%= current_user.last_chat_status %>';
     </script>
  
-
   <div id="chat-label">
+    <span id="unread-messages"></span>
     <span class="right-arrow">&#9654;</span>
     <span class="title"><%= _('Chat') %></span>
   </div>
@@ -98,10 +98,5 @@
           </div>
         </div>
       </div>
-
-      <div class="error-message">
-        <span class='error'>%{text}</span>
-      </div>
-
     </div>
   </div>
@@ -0,0 +1,8 @@
+<% label_name = profile.person? ? _('Open chat') : _('Join chat room') %>
+<% display = profile.person? ? profile.friends.include?(user) : profile.members.include?(user) %>
+
+<% if display %>
+  <li>
+    <%= button(:chat, label_name , {}, :class => 'open-conversation', 'data-jid' => profile.jid) %>
+  </li>
+<% end %>
@@ -29,6 +29,11 @@
     <p>
       <%= labelled_text_field(_("Text filter")+': ', :filter_text, nil, {:id => 'filter-text',:value => @filter_text}) %>
     </p>
+    <% if profile.organization? %>
+      <p>
+        <%= labelled_select(_('Assigned to')+': ', :filter_responsible, :id, :name, @filter_responsible, [OpenStruct.new(:name => _('All'), :id => nil), OpenStruct.new(:name => _('Unassigned'), :id => -1)] + @responsible_candidates, :class => 'filter_responsible') %>
+      </p>
+    <% end %>
     <p>
       <%= labelled_select(_('Assigned to')+': ', :filter_responsible, :id, :name, @filter_responsible, [OpenStruct.new(:name => _('All'), :id => nil), OpenStruct.new(:name => _('Unassigned'), :id => -1)] + @responsible_candidates) %>
     </p>
-<div class="environment-users-results-header">
-  <div id='environment-users-filter-title'><%= users_filter_title(@filter) %></div>
+<div class="environment-profiles-results-header">
+  <div id='environment-profiles-filter-title'><%= users_filter_title(@filter) %></div>
   <%= filter_selector(@filter) %>
   <div style="clear: both"></div>
 </div>
@@ -0,0 +1,13 @@
+# Be sure to restart your server when you modify this file.
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+ 
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters :format => []
+end
+ 
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end
 class CreateChatMessages < ActiveRecord::Migration
-  def change
+  def up
     create_table :chat_messages do |t|
       t.integer :to_id
       t.integer :from_id
@@ -8,4 +8,8 @@ class CreateChatMessages &lt; ActiveRecord::Migration
       t.timestamps
     end
   end
+
+  def down
+    drop_table :chat_messages
+  end
 end
@@ -0,0 +1,23 @@
+class ChangeChatMessagesColumnsAndAddIndexes < ActiveRecord::Migration
+  def up
+    change_table :chat_messages do |t|
+      t.change :from_id, :integer, :null => false
+      t.change :to_id, :integer, :null => false
+      t.change :body, :text
+    end
+    add_index :chat_messages, :from_id
+    add_index :chat_messages, :to_id
+    add_index :chat_messages, :created_at
+  end
+
+  def down
+    remove_index :chat_messages, :from_id
+    remove_index :chat_messages, :to_id
+    remove_index :chat_messages, :created_at
+    change_table :chat_messages do |t|
+      t.change :from_id, :integer, :null => true
+      t.change :to_id, :integer, :null => true
+      t.change :body, :string
+    end
+  end
+end
@@ -0,0 +1,15 @@
+class AddMirrorToBlock < ActiveRecord::Migration
+  def up
+    change_table :blocks do |t|
+      t.boolean :mirror, :default => false
+      t.references :mirror_block
+      t.references :observers
+    end
+  end
+
+  def down
+    remove_column :blocks, :mirror
+    remove_column :blocks, :mirror_block_id
+    remove_column :blocks, :observers_id
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20150513213939) do
+ActiveRecord::Schema.define(:version => 20150525101430) do
  
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -183,10 +183,13 @@ ActiveRecord::Schema.define(:version =&gt; 20150513213939) do
     t.string   "type"
     t.text     "settings"
     t.integer  "position"
-    t.boolean  "enabled",    :default => true
+    t.boolean  "enabled",         :default => true
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "fetched_at"
+    t.boolean  "mirror",          :default => false
+    t.integer  "mirror_block_id"
+    t.integer  "observers_id"
   end
  
   add_index "blocks", ["box_id"], :name => "index_blocks_on_box_id"
@@ -242,13 +245,17 @@ ActiveRecord::Schema.define(:version =&gt; 20150513213939) do
   end
  
   create_table "chat_messages", :force => true do |t|
-    t.integer  "to_id"
-    t.integer  "from_id"
-    t.string   "body"
+    t.integer  "from_id",    :null => false
+    t.integer  "to_id",      :null => false
+    t.text     "body"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
   end
  
+  add_index "chat_messages", ["created_at"], :name => "index_chat_messages_on_created_at"
+  add_index "chat_messages", ["from_id"], :name => "index_chat_messages_on_from_id"
+  add_index "chat_messages", ["to_id"], :name => "index_chat_messages_on_to_id"
+
   create_table "comments", :force => true do |t|
     t.string   "title"
     t.text     "body"
@@ -264,6 +271,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150513213939) do
     t.string   "user_agent"
     t.string   "referrer"
     t.text     "settings"
+    t.integer  "paragraph_id"
   end
  
   add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
@@ -677,12 +685,13 @@ ActiveRecord::Schema.define(:version =&gt; 20150513213939) do
     t.date     "end_date"
     t.integer  "requestor_id"
     t.integer  "target_id"
-    t.string   "code",         :limit => 40
+    t.string   "code",           :limit => 40
     t.string   "type"
     t.datetime "created_at"
     t.string   "target_type"
     t.integer  "image_id"
-    t.boolean  "spam",                       :default => false
+    t.boolean  "spam",                         :default => false
+    t.integer  "responsible_id"
   end
  
   add_index "tasks", ["requestor_id"], :name => "index_tasks_on_requestor_id"
@@ -21,6 +21,13 @@ if test -x /usr/share/noosfero/script/apacheconf; then
   if ! test -e "$apache_site"; then
     echo "Generating apache virtual host ..."
     cd /usr/share/noosfero && su noosfero -c "RAILS_ENV=production ./script/apacheconf virtualhosts" > "$apache_site"
+  else
+    pattern="Include \/etc\/noosfero\/apache\/virtualhost.conf"
+    include="Include \/usr\/share\/noosfero\/util\/chat\/apache\/xmpp.conf"
+    if ! cat $apache_site | grep "^ *$include" > /dev/null ; then
+      echo "Updating apache virtual host ..."
+      sed -i "s/.*$pattern.*/  $include\n&/" $apache_site
+    fi
   fi
  
   echo 'Noosfero Apache configuration updated.'
+User    "www-data"
+Group   "www-data"
 LogLevel 1
 Alive    10
 Client   120
@@ -0,0 +1,64 @@
+Feature: user template
+  As an user
+  I want to create templates with mirror blocks
+  In order to keep these blocks always updated
+
+  Background:
+    Given the following users
+      | login  | name       | is_template |
+      | person | person     | true        |
+    And the following blocks
+      | owner  | type          | mirror |
+      | person | ArticleBlock  | true   |
+      | person | RawHTMLBlock  | false  |
+    And I go to /account/signup
+    And I fill in "Username" with "mario"
+    And I fill in "Password" with "123456"
+    And I fill in "Password confirmation" with "123456"
+    And I fill in "e-Mail" with "mario@mario.com"
+    And I fill in "Full name" with "Mario"
+    And wait for the captcha signup time
+    And I press "Create my account"
+    And I am logged in as admin
+
+  @selenium
+  Scenario: The block Article name is changed
+    Given I am on person's control panel
+    And I follow "Edit sideboxes"
+    And display ".button-bar"
+    And I follow "Edit" within ".article-block"
+    And I fill in "Custom title for this block:" with "Mirror"
+    And I press "Save"
+    And I go to /profile/mario
+    Then I should see "Mirror"
+
+  @selenium
+  Scenario: The block LinkList is changed but the user's block doesnt change
+    Given I am on person's control panel
+    And I follow "Edit sideboxes"
+    And display ".button-bar"
+    And I follow "Edit" within ".raw-html-block"
+    And I fill in "Custom title for this block:" with "Raw HTML Block"
+    And I press "Save"
+    And I go to /profile/mario
+    Then I should not see "Raw HTML Block"
+
+  @selenium
+  Scenario: The block Article cannot move or modify
+    Given I am on person's control panel
+    And I follow "Edit sideboxes"
+    And display ".button-bar"
+    And I follow "Edit" within ".article-block"
+    And I select "Cannot be moved" from "Move options:"
+    And I select "Cannot be modified" from "Edit options:"
+    And I press "Save"
+    And I follow "Logout"
+    And Mario's account is activated
+    And I follow "Login"
+    And I fill in "Username / Email" with "mario"
+    And I fill in "Password" with "123456"
+    And I press "Log in"
+    And I go to /myprofile/mario
+    And I follow "Edit sideboxes"
+    And display ".button-bar"
+    Then I should not see "Edit" within ".article-block"
@@ -0,0 +1,6 @@
+module Noosfero::GeoRef
+
+  KM_LAT = 111.2 # aproximate distance in km for 1 degree latitude
+  KM_LNG = 85.3 # aproximate distance in km for 1 degree longitude
+
+end
@@ -263,10 +263,11 @@ class Noosfero::Plugin
   end
  
   # -> Adds buttons to the control panel
-  # returns = { :title => title, :icon => icon, :url => url }
-  #   title = name that will be displayed.
-  #   icon  = css class name (for customized icons include them in a css file).
-  #   url   = url or route to which the button will redirect.
+  # returns        = { :title => title, :icon => icon, :url => url }
+  #   title        = name that will be displayed.
+  #   icon         = css class name (for customized icons include them in a css file).
+  #   url          = url or route to which the button will redirect.
+  #   html_options = aditional html options.
   def control_panel_buttons
     nil
   end
@@ -309,6 +310,18 @@ class Noosfero::Plugin
     nil
   end
  
+  # -> Filters the types of organizations that are shown on manage organizations
+  # returns a scope filtered by the specified type
+  def filter_manage_organization_scope type
+    nil
+  end
+
+  # -> Add new options for manage organization filters
+  # returns an array of new options
+  # i.e [[_('Type'), 'type'], [_('Type2'), 'type2']]
+  def organization_types_filter_options
+    nil
+  end
   # -> Adds content to profile editor info and settings
   # returns = lambda block that creates html code or raw rhtml/html.erb
   def profile_editor_extras
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:10-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-12 14:23+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/noosfero/noosfero/"
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:10-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -28,15 +28,15 @@ msgstr &quot;&quot;
 msgid "A plugin that add a block to display breadcrumbs."
 msgstr "Um plugin que adiciona um bloco que mostra caminhos de pão."
  
-#: plugins/breadcrumbs/lib/breadcrumbs_plugin/content_breadcrumbs_block.rb:9
+#: plugins/breadcrumbs/lib/breadcrumbs_plugin/content_breadcrumbs_block.rb:10
 msgid "Content Breadcrumbs"
 msgstr "Conteúdo de Caminho de Pão"
  
-#: plugins/breadcrumbs/lib/breadcrumbs_plugin/content_breadcrumbs_block.rb:13
+#: plugins/breadcrumbs/lib/breadcrumbs_plugin/content_breadcrumbs_block.rb:14
 msgid "This block displays breadcrumb trail."
 msgstr "Esse bloco mostra o rastro de caminho de pão."
  
-#: plugins/breadcrumbs/lib/breadcrumbs_plugin/content_breadcrumbs_block.rb:56
+#: plugins/breadcrumbs/lib/breadcrumbs_plugin/content_breadcrumbs_block.rb:68
 msgid "Upload Files"
 msgstr "Enviar Arquivos"
  
@@ -47,3 +47,8 @@ msgstr &quot;Mostrar cms&quot;
 #: plugins/breadcrumbs/views/box_organizer/breadcrumbs_plugin/_content_breadcrumbs_block.html.erb:3
 msgid "Show profile"
 msgstr "Mostrar perfil"
+
+#: plugins/breadcrumbs/views/box_organizer/breadcrumbs_plugin/_content_breadcrumbs_block.html.erb:4
+#, fuzzy
+msgid "Show section name"
+msgstr "Mostrar cms"
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-12 14:23+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/noosfero/noosfero/"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-11-03 15:52+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/"
@@ -4,9 +4,9 @@
 # , 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-12 14:22+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/noosfero/noosfero/"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2009-10-26 16:20-0300\n"
 "Last-Translator: Anahit Minassian <anahit.minassian@cooperation.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-12 14:23+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/noosfero/"
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2015-02-23 11:38+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/noosfero/plugin-"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2015-02-24 20:46+0200\n"
 "Last-Translator: Gonzalo Exequiel Pedone <hipersayan.x@gmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/plugin-"
@@ -91,8 +91,8 @@ msgid &quot;&quot;
 "<i>%{user}</i> added the status <i>%{status_name}</i> at <i>%{created_at}</"
 "i>."
 msgstr ""
-"<i>%{user}</i> ha agregado el estado <i>%{status_name}</i> en "
-"<i>%{created_at}</i>."
+"<i>%{user}</i> ha agregado el estado <i>%{status_name}</i> en <i>"
+"%{created_at}</i>."
  
 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/add_status.html.erb:18
 msgid "<i>Reason:</i> %s"
@@ -4,9 +4,9 @@
 # , 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2015-03-07 12:26+0200\n"
 "Last-Translator: Tuux <tuxa@galaxie.eu.org>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/noosfero/plugin-"
@@ -91,8 +91,8 @@ msgid &quot;&quot;
 "<i>%{user}</i> added the status <i>%{status_name}</i> at <i>%{created_at}</"
 "i>."
 msgstr ""
-"<i>%{utilisateur}</i> ajout des statuts <i>%{nom_ du_statut}</i> à "
-"<i>%{creer_a}</i>."
+"<i>%{utilisateur}</i> ajout des statuts <i>%{nom_ du_statut}</i> à <i>"
+"%{creer_a}</i>."
  
 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/add_status.html.erb:18
 msgid "<i>Reason:</i> %s"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2015-02-23 11:37+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Armenian <https://hosted.weblate.org/projects/noosfero/plugin-"
@@ -11,12 +11,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2015-02-23 11:38+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
-"/plugin-comment-classification/pt/>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
+"plugin-comment-classification/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2015-02-23 11:37+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/noosfero/plugin-"
@@ -15,8 +15,8 @@ msgstr &quot;&quot;
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
-"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 2.3-dev\n"
  
 #: plugins/comment_classification/lib/comment_classification_plugin.rb:11
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-12 14:23+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/noosfero/noosfero/"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2015-02-24 19:06+0200\n"
 "Last-Translator: Gonzalo Exequiel Pedone <hipersayan.x@gmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/plugin-"
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:10-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2015-03-09 09:51+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/noosfero/plugin-"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:10-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-11-05 13:05+0200\n"
 "Last-Translator: Aurélio A. Heckert <aurelio@colivre.coop.br>\n"
 "Language-Team: Esperanto <https://hosted.weblate.org/projects/noosfero/"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:10-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2015-03-09 09:51+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/plugin-"
@@ -4,9 +4,9 @@
 # , 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-05 12:10-0300\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2015-02-23 11:38+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/noosfero/plugin-"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:10-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2015-02-23 11:37+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Armenian <https://hosted.weblate.org/projects/noosfero/plugin-"
@@ -11,12 +11,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:10-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2015-03-12 15:13+0200\n"
 "Last-Translator: daniel <dtygel@eita.org.br>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
-"/plugin-custom-forms/pt/>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
+"plugin-custom-forms/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:10-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2015-03-09 09:51+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/noosfero/plugin-"
@@ -15,8 +15,8 @@ msgstr &quot;&quot;
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
-"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 2.3-dev\n"
  
 #: plugins/custom_forms/lib/custom_forms_plugin/form.rb:67
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2015-02-23 11:37+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/noosfero/plugin-"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2015-03-09 09:51+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/plugin-"
@@ -4,9 +4,9 @@
 # , 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2015-03-07 02:11+0200\n"
 "Last-Translator: Tuux <tuxa@galaxie.eu.org>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/noosfero/plugin-"
@@ -106,7 +106,8 @@ msgstr &quot;plus&quot;
  
 #: plugins/display_content/views/box_organizer/_choose_directly.html.erb:5
 msgid "Dinamically load children of selected folders"
-msgstr "Dynamiquement charger les sous répertoires des répertoires sélectionnés"
+msgstr ""
+"Dynamiquement charger les sous répertoires des répertoires sélectionnés"
  
 #: plugins/display_content/views/box_organizer/_choose_directly.html.erb:9
 msgid "Limit:"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2009-10-26 16:20-0300\n"
 "Last-Translator: Anahit Minassian <anahit.minassian@cooperation.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -11,12 +11,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2015-03-12 15:14+0200\n"
 "Last-Translator: daniel <dtygel@eita.org.br>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
-"/plugin-display-content/pt/>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
+"plugin-display-content/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1~rc4\n"
-"POT-Creation-Date: 2015-04-20 19:44-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2015-01-30 00:18-0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,17 +16,6 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
  
-#: plugins/event/lib/event_plugin.rb:4
-msgid "Event Extras"
-msgstr "Extras para Eventos"
-
-#: plugins/event/lib/event_plugin.rb:8
-msgid ""
-"Include a new block to show the environment's or profiles' events information"
-msgstr ""
-"Adiciona um novo bloco para apresentar as informações de eventos do ambiente "
-"ou dos perfis"
-
 #: plugins/event/lib/event_plugin/event_block.rb:12
 msgid "Events"
 msgstr "Eventos"
@@ -61,7 +50,24 @@ msgstr[1] &quot;%d dias para começar&quot;
 msgid "One month left to start"
 msgid_plural "%d months left to start"
 msgstr[0] "Um mês para iniciar"
-msgstr[1] "% meses para iniciar"
+msgstr[1] "%d meses para iniciar"
+
+#: plugins/event/lib/event_plugin.rb:4
+msgid "Event Extras"
+msgstr "Extras para Eventos"
+
+#: plugins/event/lib/event_plugin.rb:8
+msgid ""
+"Include a new block to show the environment's or profiles' events information"
+msgstr ""
+"Adiciona um novo bloco para apresentar as informações de eventos do ambiente "
+"ou dos perfis"
+
+#: plugins/event/views/event_plugin/event_block_item.html.erb:6
+msgid "Duration: 1 day"
+msgid_plural "Duration: %s days"
+msgstr[0] "Duração: 1 dia"
+msgstr[1] "Duração: %s dias"
  
 #: plugins/event/views/profile_design/event_plugin/_event_block.html.erb:1
 msgid "Limit of items"
@@ -92,12 +98,6 @@ msgstr &quot;Limite de dias para mostrar&quot;
 msgid "Only show events in this interval of days."
 msgstr "Mostar somente os eventos nesse intervalo de dias"
  
-#: plugins/event/views/event_plugin/event_block_item.html.erb:6
-msgid "Duration: 1 day"
-msgid_plural "Duration: %s days"
-msgstr[0] "Duração: 1 dia"
-msgstr[1] "Duração: %s dias"
-
 #~ msgid "Started one day ago."
 #~ msgid_plural "Started %d days ago."
 #~ msgstr[0] "Iniciou a Um dia atrás."
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-12 14:23+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/noosfero/noosfero/"
@@ -19,6 +19,6 @@ msgstr &quot;&quot;
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.2-dev\n"
  
-#: plugins/foo/lib/foo_plugin.rb:8
+#: plugins/foo/lib/foo_plugin.rb:9
 msgid "A sample plugin to test autoload craziness."
 msgstr "Ein Beispiel-Plugin, um die Autoload-Verrücktheit zu überprüfen."
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-11-03 15:52+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/"
@@ -18,6 +18,6 @@ msgstr &quot;&quot;
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.0-dev\n"
  
-#: plugins/foo/lib/foo_plugin.rb:8
+#: plugins/foo/lib/foo_plugin.rb:9
 msgid "A sample plugin to test autoload craziness."
 msgstr "Un plugin de ejemplo para probar autocargar la locura."
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -24,6 +24,6 @@ msgstr &quot;&quot;
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.0\n"
  
-#: plugins/foo/lib/foo_plugin.rb:8
+#: plugins/foo/lib/foo_plugin.rb:9
 msgid "A sample plugin to test autoload craziness."
 msgstr "Um plugin de teste para testar a loucura do caregamento."
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-12 14:23+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/noosfero/noosfero/"
@@ -22,3 +22,11 @@ msgstr &quot;&quot;
 #: plugins/google_analytics/lib/google_analytics_plugin.rb:13
 msgid "Tracking and web analytics to people and communities"
 msgstr "Nachverfolgung und Webanalyse für Personen und Gemeinschaften"
+
+#: plugins/google_analytics/views/profile-editor-extras.html.erb:2
+msgid "Google Analytics Profile ID"
+msgstr ""
+
+#: plugins/google_analytics/views/profile-editor-extras.html.erb:3
+msgid "See how to configure statistics for your profile"
+msgstr ""
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-11-03 15:52+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/"
@@ -21,3 +21,11 @@ msgstr &quot;&quot;
 #: plugins/google_analytics/lib/google_analytics_plugin.rb:13
 msgid "Tracking and web analytics to people and communities"
 msgstr "Seguimiento y análisis web para las personas y las comunidades"
+
+#: plugins/google_analytics/views/profile-editor-extras.html.erb:2
+msgid "Google Analytics Profile ID"
+msgstr ""
+
+#: plugins/google_analytics/views/profile-editor-extras.html.erb:3
+msgid "See how to configure statistics for your profile"
+msgstr ""
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -27,3 +27,11 @@ msgstr &quot;&quot;
 #: plugins/google_analytics/lib/google_analytics_plugin.rb:13
 msgid "Tracking and web analytics to people and communities"
 msgstr "Rastreamento e análise web para pessoas e comunidades"
+
+#: plugins/google_analytics/views/profile-editor-extras.html.erb:2
+msgid "Google Analytics Profile ID"
+msgstr ""
+
+#: plugins/google_analytics/views/profile-editor-extras.html.erb:3
+msgid "See how to configure statistics for your profile"
+msgstr ""
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-12 14:23+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/noosfero/noosfero/"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-11-03 15:52+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/"
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -11,12 +11,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2015-02-17 10:50+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
-"/plugin-lattes-curriculum/pt/>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
+"plugin-lattes-curriculum/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-12 14:23+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/noosfero/noosfero/"
@@ -19,7 +19,7 @@ msgstr &quot;&quot;
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.2-dev\n"
  
-#: plugins/ldap/lib/ldap_plugin.rb:10
+#: plugins/ldap/lib/ldap_plugin.rb:11
 #, fuzzy
 msgid "A plugin that add ldap support."
 msgstr "Ein Plugin, welches dies und jenes tut."
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -24,7 +24,7 @@ msgstr &quot;&quot;
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.0\n"
  
-#: plugins/ldap/lib/ldap_plugin.rb:10
+#: plugins/ldap/lib/ldap_plugin.rb:11
 msgid "A plugin that add ldap support."
 msgstr "Um plugin que adiciona suporte a ldap."
  
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:10-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
-Subproject commit b18d03a73f4db349adc25d730c5afcedb57cecb1
+Subproject commit c733dd106a1adf55a4674e82ea809237fa42252b
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-12 14:23+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/noosfero/noosfero/"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-11-03 15:52+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/"
@@ -4,9 +4,9 @@
 # , 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0-690-gcb6e853\n"
+"Project-Id-Version: 1.1-166-gaf47713\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"POT-Creation-Date: 2015-06-01 17:26-0300\n"
 "PO-Revision-Date: 2014-12-12 14:22+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/noosfero/noosfero/"
...	...	@@ -11,8 +11,8 @@ as below:
11	11
12	12	# mkdir /etc/noosfero/ssl
13	13	# cd /etc/noosfero/ssl
14		- # openssl genrsa 1024 > noosfero.key
15		- # openssl req -new -x509 -nodes -sha1 -days $[10*365] -key noosfero.key > noosfero.cert
	14	+ # openssl genrsa 2048 > noosfero.key
	15	+ # openssl req -new -x509 -sha256 -nodes -days $[10*365] -key noosfero.key > noosfero.cert
16	16	# cat noosfero.key noosfero.cert > noosfero.pem
17	17
18	18	## Web server configuration
...	...
...	...	@@ -74,7 +74,7 @@ downloading from git
74	74
75	75	Here we are cloning the noosfero repository from git. Note: you will need to install git before.
76	76
77		- $ git clone git://gitorious.org/noosfero/noosfero.git current
	77	+ $ git clone https://gitlab.com/noosfero/noosfero.git current
78	78	$ cd current
79	79	$ git checkout -b stable origin/stable
80	80
...	...
...	...	@@ -71,22 +71,4 @@ class AdminPanelController < AdminController
71	71	end
72	72	end
73	73	end
74		-
75		- def manage_organizations_status
76		- scope = environment.organizations
77		- @filter = params[:filter] \|\| 'any'
78		- @title = "Organization profiles"
79		- @title = @title+" - "+@filter if @filter != 'any'
80		-
81		- if @filter == 'enabled'
82		- scope = scope.visible
83		- elsif @filter == 'disabled'
84		- scope = scope.disabled
85		- end
86		-
87		- scope = scope.order('name ASC')
88		-
89		- @q = params[:q]
90		- @collection = find_by_contents(:organizations, environment, scope, @q, {:per_page => 10, :page => params[:npage]})[:results]
91		- end
92	74	end
...	...
...	...	@@ -0,0 +1,66 @@
	1	+class OrganizationsController < AdminController
	2	+
	3	+ protect 'manage_environment_organizations', :environment
	4	+
	5	+ def index
	6	+ @filter = params[:filter] \|\| 'any'
	7	+ @title = _('Organization profiles')
	8	+ @type = params[:type] \|\| "any"
	9	+ @types_filter = [[_('All'), 'any'], [_('Community'), 'Community'], [_('Enterprise'), 'Enterprise']]
	10	+ @types_filter = @types_filter \| @plugins.dispatch(:organization_types_filter_options)
	11	+
	12	+ scope = @plugins.dispatch_first(:filter_manage_organization_scope, @type)
	13	+ if scope.blank?
	14	+ scope = environment.organizations
	15	+ scope = scope.where(:type => @type) if @type != 'any'
	16	+ end
	17	+
	18	+ if @filter == 'enabled'
	19	+ scope = scope.visible
	20	+ elsif @filter == 'disabled'
	21	+ scope = scope.disabled
	22	+ end
	23	+
	24	+ scope = scope.order('name ASC')
	25	+
	26	+ @q = params[:q]
	27	+ @collection = find_by_contents(:organizations, environment, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
	28	+ end
	29	+
	30	+ def activate
	31	+ organization = environment.organizations.find(params[:id])
	32	+ if organization.enable
	33	+ render :text => (_('%s enabled') % organization.name).to_json
	34	+ else
	35	+ render :text => (_('%s could not be enabled') % organization.name).to_json
	36	+ end
	37	+ end
	38	+
	39	+ def deactivate
	40	+ organization = environment.organizations.find(params[:id])
	41	+ if organization.disable
	42	+ render :text => (_('%s disabled') % organization.name).to_json
	43	+ else
	44	+ render :text => (_('%s could not be disable') % organization.name).to_json
	45	+ end
	46	+ end
	47	+
	48	+ def destroy
	49	+ if request.post?
	50	+ organization = environment.organizations.find(params[:id])
	51	+ if organization && organization.destroy
	52	+ render :text => (_('%s removed') % organization.name).to_json
	53	+ else
	54	+ render :text => (_('%s could not be removed') % organization.name).to_json
	55	+ end
	56	+ else
	57	+ render :nothing => true
	58	+ end
	59	+ end
	60	+
	61	+ private
	62	+
	63	+ def per_page
	64	+ 10
	65	+ end
	66	+end
...	...
...	...	@@ -14,7 +14,7 @@ class TasksController < MyProfileController
14	14
15	15	@failed = params ? params[:failed] : {}
16	16
17		- @responsible_candidates = profile.members.by_role(profile.roles.reject {\|r\| !r.has_permission?('perform_task')})
	17	+ @responsible_candidates = profile.members.by_role(profile.roles.reject {\|r\| !r.has_permission?('perform_task')}) if profile.organization?
18	18	end
19	19
20	20	def processed
...	...
...	...	@@ -2,6 +2,7 @@ class ChatController < PublicController
2	2
3	3	before_filter :login_required
4	4	before_filter :check_environment_feature
	5	+ before_filter :can_send_message, :only => :register_message
5	6
6	7	def start_session
7	8	login = user.jid
...	...	@@ -54,6 +55,16 @@ class ChatController < PublicController
54	55	end
55	56	end
56	57
	58	+ def avatars
	59	+ profiles = environment.profiles.where(:identifier => params[:profiles])
	60	+ avatar_map = profiles.inject({}) do \|result, profile\|
	61	+ result[profile.identifier] = profile_icon(profile, :minor)
	62	+ result
	63	+ end
	64	+
	65	+ render_json avatar_map
	66	+ end
	67	+
57	68	def update_presence_status
58	69	if request.xhr?
59	70	current_user.update_attributes({:chat_status_at => DateTime.now}.merge(params[:status] \|\| {}))
...	...	@@ -62,11 +73,17 @@ class ChatController < PublicController
62	73	end
63	74
64	75	def save_message
65		- to = environment.profiles.find_by_identifier(params[:to])
66		- body = params[:body]
67		-
68		- ChatMessage.create!(:to => to, :from => user, :body => body)
69		- render :text => 'ok'
	76	+ if request.post?
	77	+ to = environment.profiles.where(:identifier => params[:to]).first
	78	+ body = params[:body]
	79	+
	80	+ begin
	81	+ ChatMessage.create!(:to => to, :from => user, :body => body)
	82	+ return render_json({:status => 0})
	83	+ rescue Exception => exception
	84	+ return render_json({:status => 3, :message => exception.to_s, :backtrace => exception.backtrace})
	85	+ end
	86	+ end
70	87	end
71	88
72	89	def recent_messages
...	...	@@ -90,8 +107,9 @@ class ChatController < PublicController
90	107	end
91	108
92	109	def recent_conversations
93		- conversations_order = ActiveRecord::Base.connection.execute("select profiles.identifier from profiles inner join (select distinct r.id as id, MAX(r.created_at) as created_at from (select from_id, to_id, created_at, (case when from_id=#{user.id} then to_id else from_id end) as id from chat_messages where from_id=#{user.id} or to_id=#{user.id}) as r group by id order by created_at desc, id) as t on profiles.id=t.id order by t.created_at desc").entries.map {\|e\| e['identifier']}
94		- render :json => {:order => conversations_order.reverse, :domain => environment.default_hostname.gsub('.','-')}.to_json
	110	+ profiles = Profile.find_by_sql("select profiles.* from profiles inner join (select distinct r.id as id, MAX(r.created_at) as created_at from (select from_id, to_id, created_at, (case when from_id=#{user.id} then to_id else from_id end) as id from chat_messages where from_id=#{user.id} or to_id=#{user.id}) as r group by id order by created_at desc, id) as t on profiles.id=t.id order by t.created_at desc")
	111	+ jids = profiles.map(&:jid).reverse
	112	+ render :json => jids.to_json
95	113	end
96	114
97	115	#TODO Ideally this is done through roster table on ejabberd.
...	...	@@ -108,4 +126,14 @@ class ChatController < PublicController
108	126	end
109	127	end
110	128
	129	+ def can_send_message
	130	+ return render_json({:status => 1, :message => 'Missing parameters!'}) if params[:from].nil? \|\| params[:to].nil? \|\| params[:message].nil?
	131	+ return render_json({:status => 2, :message => 'You can not send message as another user!'}) if params[:from] != user.jid
	132	+ # TODO Maybe register the jid in a table someday to avoid this below
	133	+ return render_json({:status => 3, :messsage => 'You can not send messages to strangers!'}) if user.friends.where(:identifier => params[:to].split('@').first).blank?
	134	+ end
	135	+
	136	+ def render_json(result)
	137	+ render :text => result.to_json
	138	+ end
111	139	end
...	...
...	...	@@ -881,7 +881,7 @@ module ApplicationHelper
881	881	field_html += capture(&block)
882	882	end
883	883
884		- if controller.action_name == 'signup' \|\| controller.action_name == 'new_community' \|\| (controller.controller_name == "enterprise_registration" && controller.action_name == 'index')
	884	+ if controller.action_name == 'signup' \|\| controller.action_name == 'new_community' \|\| (controller.controller_name == "enterprise_registration" && controller.action_name == 'index') \|\| (controller.controller_name == 'home' && controller.action_name == 'index' && user.nil?)
885	885	if profile.signup_fields.include?(name)
886	886	result = field_html
887	887	end
...	...
...	...	@@ -122,7 +122,7 @@ module BoxesHelper
122	122	end
123	123
124	124	def wrap_main_content(content)
125		- (1..8).to_a.reverse.inject(content) { \|acc,n\| content_tag('div', acc, :id => 'main-content-wrapper-' + n.to_s) }
	125	+ content_tag('div', content, :class => 'main-content')
126	126	end
127	127
128	128	def extract_block_content(content)
...	...
...	...	@@ -9,12 +9,12 @@ module ChatHelper
9	9	avatar = profile_image(user, :portrait, :class => 'avatar')
10	10	content_tag('span',
11	11	link_to(avatar + content_tag('span', user.name) + ui_icon('ui-icon-triangle-1-s'),
12		- '#',
	12	+ '',
13	13	:onclick => 'toggleMenu(this); return false',
14	14	:class => icon_class + ' simplemenu-trigger'
15	15	) +
16	16	content_tag('ul',
17		- links.map{\|link\| content_tag('li', link_to(link[1], '#', :class => link[0], :id => link[2], 'data-jid' => user.jid), :class => 'simplemenu-item') }.join("\n"),
	17	+ links.map{\|link\| content_tag('li', link_to(link[1], '', :class => link[0], :id => link[2], 'data-jid' => user.jid), :class => 'simplemenu-item') }.join("\n"),
18	18	:style => 'display: none; z-index: 100',
19	19	:class => 'simplemenu-submenu'
20	20	),
...	...
...	...	@@ -141,8 +141,9 @@ module ProfileEditorHelper
141	141	)
142	142	end
143	143
144		- def control_panel_button(title, icon, url)
145		- link_to title, url, :class => 'control-panel-%s' % icon
	144	+ def control_panel_button(title, icon, url, html_options = {})
	145	+ html_options \|\|= {}
	146	+ link_to title, url, html_options.merge(:class => 'control-panel-%s' % icon)
146	147	end
147	148
148	149	def unchangeable_privacy_field(profile)
...	...