fixing conflit

Leandro Santos
2 parents b4a9d58b 13b1e058
Showing 46 changed files with 176 additions and 145 deletions Show diff stats
.gitmodules
app/controllers/public/content_viewer_controller.rb
app/controllers/public/events_controller.rb
app/controllers/public/search_controller.rb
app/helpers/boxes_helper.rb
app/views/search/search.js.erb
config/initializers/newrelic.rb
db/migrate/20140724134601_fix_yaml_encoding.rb
debian/changelog
features/edit_article.feature
features/login.feature
features/step_definitions/internationalization_steps.rb
features/step_definitions/noosfero_steps.rb
lib/acts_as_having_image.rb
lib/noosfero/version.rb
lib/tasks/plugins_tests.rake
plugins/comment_group/test/functional/comment_group_plugin_profile_controller_test.rb
plugins/comment_paragraph
plugins/context_content/lib/context_content_plugin/context_content_block.rb
plugins/context_content/test/unit/context_content_block_test.rb
@@ -19,3 +19,12 @@
 [submodule "plugins/site_tour"]
 	path = plugins/site_tour
 	url = git@gitlab.com:noosfero-plugins/site_tour.git
+[submodule "plugins/gamification"]
+	path = plugins/gamification
+	url = git@gitlab.com:noosfero-plugins/gamification.git
+[submodule "plugins/comment_paragraph"]
+	path = plugins/comment_paragraph
+	url = git@gitlab.com:noosfero-plugins/comment-paragraph.git
+[submodule "plugins/notification"]
+	path = plugins/notification
+	url = git@gitlab.com:noosfero-plugins/notification.git
@@ -107,10 +107,12 @@ class ContentViewerController &lt; ApplicationController
           if translation.language == locale
             @page = translation
             redirect_to :profile => @page.profile.identifier, :page => @page.explode_path
+            return true
           end
         end
       end
     end
+    false
   end
   def pass_without_comment_captcha?
@@ -5,7 +5,11 @@ class EventsController &lt; PublicController
   def events
     @events = []
-    @date = build_date(params[:year], params[:month], params[:day])
+    begin
+      @date = build_date params[:year], params[:month], params[:day]
+    rescue ArgumentError # invalid date
+      return render_not_found
+    end
     if !params[:year] && !params[:month] && !params[:day]
       @events = profile.events.next_events_from_month(@date).paginate(:per_page => per_page, :page => params[:page])
@@ -62,7 +62,7 @@ class SearchController &lt; PublicController
   end
   def articles
-    @scope = @environment.articles.public.paginate(paginate_options)
+    @scope = @environment.articles.public
     full_text_search
   end
@@ -76,7 +76,7 @@ class SearchController &lt; PublicController
   end
   def products
-    @scope = @environment.products.paginate(paginate_options)
+    @scope = @environment.products
     full_text_search
   end
@@ -244,7 +244,7 @@ class SearchController &lt; PublicController
   def visible_profiles(klass, *extra_relations)
     relations = [:image, :domains, :environment, :preferred_domain]
     relations += extra_relations
-    @environment.send(klass.name.underscore.pluralize).visible.includes(relations).paginate(paginate_options)
+    @environment.send(klass.name.underscore.pluralize).visible.includes(relations)
   end
   def per_page
@@ -271,7 +271,7 @@ module BoxesHelper
               content_tag('div', _('Below, you''ll see a field containing embed code for the block. Just copy the code and paste it into your website or blogging software.'), :style => 'margin-bottom: 1em;') +
               content_tag('textarea', embed_code, :style => 'margin-bottom: 1em; width:100%; height:40%;', :readonly => 'readonly') +
               modal_close_button(_('Close')), :style => 'display: none;', :id => "embed-code-box-#{block.id}")
-      buttons << modal_inline_icon(:embed, _('Embed code'), {}, "embed-code-box-#{block.id}") << html
+      buttons << modal_inline_icon(:embed, _('Embed code'), {}, "#embed-code-box-#{block.id}") << html
     end
     content_tag('div', buttons.join("\n") + tag('br', :style => 'clear: left'), :class => 'button-bar')
-jQuery('#search-content').html('<%= escape_javascript(render :partial => "search_content") %>');
+jQuery('#search-content').replaceWith('<%= escape_javascript(render "search_content") %>');
+
@@ -1,2 +0,0 @@
-# Load newrelic agent if its config file is defined.
-require 'newrelic_rpm' if File.exist?(File.dirname(__FILE__) + '/../newrelic.yml')
@@ -18,9 +18,8 @@ class FixYamlEncoding &lt; ActiveRecord::Migration
   private
   def self.fix_encoding(model, param)
-    result = model.all
-    puts "Fixing #{result.count} rows of #{model} (#{param})"
-    result.each do |r|
+    puts "Fixing #{model.count} rows of #{model} (#{param})"
+    model.find_each do |r|
       begin
         yaml = r.send(param)
         # if deserialization failed then a string is returned
+noosfero (1.1~rc4) wheezy; urgency=medium
+
+  * Fourth release candidate for Noosfero 1.1
+
+ -- Antonio Terceiro <terceiro@debian.org>  Wed, 01 Apr 2015 12:22:36 -0300
+
 noosfero (1.1~rc2) wheezy; urgency=low
   * Second release candidate for Noosfero 1.1
@@ -250,6 +250,7 @@ Feature: edit article
   Scenario: add a translation to an article
     Given I am on joaosilva's sitemap
     And I follow "Save the whales"
+    And the following languages "en es" are available on environment
     Then I should not see "Add translation"
     And I follow "Edit"
     And I select "English" from "Language"
@@ -267,6 +268,7 @@ Feature: edit article
       | owner     | name               | language |
       | joaosilva | Article in English | en       |
     And I am on joaosilva's sitemap
+    And the following languages "en pt" are available on environment
     When I follow "Article in English"
     And I follow "Add translation"
     And I fill in "Title" with "Article in Portuguese"
@@ -207,18 +207,3 @@ Feature: login
       | Password | 123456 |
     When I press "Log in"
     Then I should be on joaosilva's control panel
-
-  Scenario: join community on login
-    Given the following users
-      | login | name |
-      | mariasilva | Maria Silva |
-    And the following communities
-       | name           | identifier    | owner     |
-       | Free Software  | freesoftware  | mariasilva |
-    And I am on /freesoftware
-    When I follow "Join"
-    And I fill in the following:
-      | Username / Email | joaosilva |
-      | Password | 123456 |
-    And I press "Log in"
-    Then "Joao Silva" should be a member of "Free Software"
@@ -22,6 +22,10 @@ Given /^Noosfero is configured to use (.+) as default$/ do |lang|
   Noosfero.default_locale = language_to_code(lang)
 end
+Given /^the following languages "([^"]*)" are available on environment$/ do |languages|
+  Environment.default.update_attribute(:languages, languages.split)
+end
+
 After do
   # reset everything back to normal
   Noosfero.default_locale = nil
@@ -293,6 +293,7 @@ Given /^I am logged in as &quot;(.+)&quot;$/ do |username|
   When %{I press "Log in"}
   And %{I go to #{username}'s control panel}
   Then %{I should be on #{username}'s control panel}
+  @current_user = username
 end
 Given /^"([^"]*)" is environment admin$/ do |person|
@@ -2,7 +2,7 @@ module ActsAsHavingImage
   module ClassMethods
     def acts_as_having_image
-      belongs_to :image
+      belongs_to :image, dependent: :destroy
       scope :with_image, :conditions => [ "#{table_name}.image_id IS NOT NULL" ]
       scope :without_image, :conditions => [ "#{table_name}.image_id IS NULL" ]
       self.send(:include, ActsAsHavingImage)
@@ -19,4 +19,4 @@ module ActsAsHavingImage
 end
 -ActiveRecord::Base.extend(ActsAsHavingImage::ClassMethods)
+ActiveRecord::Base.extend(ActsAsHavingImage::ClassMethods)
 \ No newline at end of file
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '1.1~rc2'
+  VERSION = '1.1~rc4'
 end
 root = File.expand_path(File.dirname(__FILE__) + '/../..')
@@ -4,7 +4,6 @@ $broken_plugins = %w[
   comment_classification
   ldap
   solr
-  stoa
 ]
 @all_plugins = Dir.glob('plugins/*').map { |f| File.basename(f) } - ['template']
@@ -22,8 +22,9 @@ class CommentGroupPluginProfileControllerTest &lt; ActionController::TestCase
     comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
     xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
     assert_template 'comment_group_plugin_profile/view_comments'
-    assert_match /comments_list_group_0/, @response.body
-    assert_match /\"comment-count-0\", \"1\"/, @response.body
+    assert_select_rjs '#comments_list_group_0'
+    assert_select_rjs :replace_html, '#comment-count-0'
+    assert_equal 1, assigns(:comments_count)
   end
   should 'do not show global comments' do
@@ -31,8 +32,9 @@ class CommentGroupPluginProfileControllerTest &lt; ActionController::TestCase
     fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
     xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
     assert_template 'comment_group_plugin_profile/view_comments'
-    assert_match /comments_list_group_0/, @response.body
-    assert_match /\"comment-count-0\", \"1\"/, @response.body
+    assert_select_rjs '#comments_list_group_0'
+    assert_select_rjs :replace_html, '#comment-count-0'
+    assert_equal 1, assigns(:comments_count)
   end
   should 'show first page comments only' do
@@ -0,0 +1 @@
+Subproject commit 17997821e62e31c7a4c34156bed505273e2c2579
@@ -58,7 +58,7 @@ class ContextContentPlugin::ContextContentBlock &lt; Block
   def contents(page, p=1)
     return @children unless @children.blank?
     if page
-      @children = page.children.with_types(types).paginate(:per_page => limit, :page => p)
+      @children = page.children.with_types(types).order(:name).paginate(:per_page => limit, :page => p)
       (@children.blank? && show_parent_content) ? contents(page.parent, p) : @children
     else
       nil
@@ -51,18 +51,18 @@ class ContextContentBlockTest &lt; ActiveSupport::TestCase
   should 'show contents for next page' do
     @block.limit = 2
     folder = fast_create(Folder)
-    article1 = fast_create(TinyMceArticle, :parent_id => folder.id)
-    article2 = fast_create(TinyMceArticle, :parent_id => folder.id)
-    article3 = fast_create(TinyMceArticle, :parent_id => folder.id)
+    article1 = fast_create(TinyMceArticle, :name => 'article 1', :parent_id => folder.id)
+    article2 = fast_create(TinyMceArticle, :name => 'article 2', :parent_id => folder.id)
+    article3 = fast_create(TinyMceArticle, :name => 'article 3', :parent_id => folder.id)
     assert_equal [article3], @block.contents(folder, 2)
   end
   should 'show parent contents for next page' do
     @block.limit = 2
     folder = fast_create(Folder)
-    article1 = fast_create(TinyMceArticle, :parent_id => folder.id)
-    article2 = fast_create(TinyMceArticle, :parent_id => folder.id)
-    article3 = fast_create(TinyMceArticle, :parent_id => folder.id)
+    article1 = fast_create(TinyMceArticle, :name => 'article 1', :parent_id => folder.id)
+    article2 = fast_create(TinyMceArticle, :name => 'article 2', :parent_id => folder.id)
+    article3 = fast_create(TinyMceArticle, :name => 'article 3', :parent_id => folder.id)
     assert_equal [article3], @block.contents(article1, 2)
   end
@@ -40,7 +40,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     Article.delete_all
     get :index, :block_id => block.id
     json_response = ActiveSupport::JSON.decode(@response.body)
-    assert_equivalent [], json_response
+    assert_equal [], json_response
   end
   should 'index action returns an json with node content' do
@@ -52,7 +52,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     expected_json = {'data' => article.title}
     expected_json['attr'] = { 'node_id' => article.id, 'parent_id' => article.parent_id}
-    assert_equivalent [expected_json], json_response
+    assert_hash_equivalent [expected_json], json_response
   end
   should 'index action returns an json with node checked if the node is in the nodes list' do
@@ -67,7 +67,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     expected_json['attr'] = { 'node_id' => article.id, 'parent_id' => article.parent_id}
     expected_json['attr'].merge!({'class' => 'jstree-checked'})
-    assert_equivalent [expected_json], json_response
+    assert_hash_equivalent [expected_json], json_response
   end
   should 'index action returns an json with node undetermined if the node is in the parent nodes list' do
@@ -95,7 +95,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     expected_json['attr'] = { 'node_id' => f.id, 'parent_id' => f.parent_id}
     expected_json['state'] = 'closed'
-    assert_equivalent [expected_json], json_response
+    assert_hash_equivalent [expected_json], json_response
   end
   should 'index action returns an json with all the children nodes if some parent is in the parents list' do
@@ -118,7 +118,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     expected_json['children'] = children
     expected_json['state'] = 'closed'
-    assert_equivalent [expected_json], json_response
+    assert_hash_equivalent [expected_json], json_response
   end
   should 'index action returns an json with all the children nodes and root nodes if some parent is in the parents list and there is others root articles' do
@@ -148,7 +148,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     value['attr'] = { 'node_id' => a3.id, 'parent_id' => a3.parent_id, "class" => "jstree-checked"}
     expected_json.push(value)
-    assert_equivalent expected_json, json_response
+    assert_hash_equivalent expected_json, json_response
   end
   should 'index action returns an json without children nodes if the parent is not in the parents list' do
@@ -170,7 +170,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
     value['attr'] = { 'node_id' => a3.id, 'parent_id' => a3.parent_id}
     expected_json.push(value)
-    assert_equivalent expected_json, json_response
+    assert_hash_equivalent expected_json, json_response
   end
 end
@@ -41,7 +41,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     Article.delete_all
     get :index, :block_id => block.id, :profile => profile.identifier
     json_response = ActiveSupport::JSON.decode(@response.body)
-    assert_equivalent [], json_response
+    assert_equal [], json_response
   end
   should 'index action returns an json with node content' do
@@ -53,7 +53,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     expected_json = {'data' => article.title}
     expected_json['attr'] = { 'node_id' => article.id, 'parent_id' => article.parent_id}
-    assert_equivalent [expected_json], json_response
+    assert_hash_equivalent [expected_json], json_response
   end
   should 'index action returns an json with node checked if the node is in the nodes list' do
@@ -68,7 +68,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     expected_json['attr'] = { 'node_id' => article.id, 'parent_id' => article.parent_id}
     expected_json['attr'].merge!({'class' => 'jstree-checked'})
-    assert_equivalent [expected_json], json_response
+    assert_hash_equivalent [expected_json], json_response
   end
   should 'index action returns an json with node undetermined if the node is in the parent nodes list' do
@@ -97,7 +97,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     expected_json['attr'] = { 'node_id' => f.id, 'parent_id' => f.parent_id}
     expected_json['state'] = 'closed'
-    assert_equivalent [expected_json], json_response
+    assert_hash_equivalent [expected_json], json_response
   end
   should 'index action returns an json with all the children nodes if some parent is in the parents list' do
@@ -120,26 +120,26 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     expected_json['children'] = children
     expected_json['state'] = 'closed'
-      assert_equivalent [expected_json], json_response
-    end
-
-    should 'index action returns an json with all the children nodes and root nodes if some parent is in the parents list and there is others root articles' do
-      Article.delete_all
-      f = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
-      a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
-      a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id)
-      a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id)
-      block.checked_nodes = {a1.id => true}
-      block.save!
-
-      get :index, :block_id => block.id, :profile => profile.identifier
-      json_response = ActiveSupport::JSON.decode(@response.body)
-      expected_json = []
-      value = {'data' => f.title}
-      value['attr'] = { 'node_id' => f.id, 'parent_id' => f.parent_id}
-      children = [
-     {'data' => a1.title, 'attr' => {'node_id' => a1.id, 'parent_id' => a1.parent_id, "class" => "jstree-checked"}},
-     {'data' => a2.title, 'attr' => {'node_id' => a2.id, 'parent_id'=> a2.parent_id}}
+    assert_hash_equivalent [expected_json], json_response
+  end
+
+  should 'index action returns an json with all the children nodes and root nodes if some parent is in the parents list and there is others root articles' do
+    Article.delete_all
+    f = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
+    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
+    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id)
+    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id)
+    block.checked_nodes = {a1.id => true}
+    block.save!
+
+    get :index, :block_id => block.id, :profile => profile.identifier
+    json_response = ActiveSupport::JSON.decode(@response.body)
+    expected_json = []
+    value = {'data' => f.title}
+    value['attr'] = { 'node_id' => f.id, 'parent_id' => f.parent_id}
+    children = [
+      {'data' => a1.title, 'attr' => {'node_id' => a1.id, 'parent_id' => a1.parent_id, "class" => "jstree-checked"}},
+      {'data' => a2.title, 'attr' => {'node_id' => a2.id, 'parent_id'=> a2.parent_id}}
     ]
     value['attr'].merge!({'class' => 'jstree-undetermined'})
     value['children'] = children
@@ -150,7 +150,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     value['attr'] = { 'node_id' => a3.id, 'parent_id' => a3.parent_id}
     expected_json.push(value)
-    assert_equivalent expected_json, json_response
+    assert_hash_equivalent expected_json, json_response
   end
   should 'index action returns an json without children nodes if the parent is not in the parents list' do
@@ -172,7 +172,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
     value['attr'] = { 'node_id' => a3.id, 'parent_id' => a3.parent_id}
     expected_json.push(value)
-    assert_equivalent expected_json, json_response
+    assert_hash_equivalent expected_json, json_response
   end
 end
-require File.dirname(__FILE__) + '/../../../test/test_helper'
+require_relative "../../../test/test_helper"
+
+def sort_by_data(array)
+  return if array.blank?
+  array.each {|el| el['children'] = sort_by_data(el['children']) }
+  array.sort_by {|el| el['data']}
+end
+
+def assert_hash_equivalent(expected, response)
+  assert_equal sort_by_data(expected), sort_by_data(response)
+end
@@ -0,0 +1 @@
+Subproject commit a8aed5d9befec360868155eba1be426cee015a18
@@ -0,0 +1 @@
+Subproject commit 2ddc87243cea571c26eae9213e8c7d6b108bdeda
@@ -157,7 +157,7 @@ pjax = {
       document._write = document.write;
       document.write = function (data) {
         if (document.readyState != 'loading')
-          content.append(data);
+          pjax.content.append(data);
         else
           document._write(data);
       };
 require File.expand_path(File.dirname(__FILE__) + "/../../../../test/test_helper")
 class ProfileDescriptionBlockTest < ActiveSupport::TestCase
-	def setup
-		e = Environment.default
+  def setup
+    e = Environment.default
     e.enabled_plugins = ['ProfileDescriptionPlugin']
     @person = create_user('test_user').person
     @profile = Profile.create!(:identifier => '1236',
                                :name => 'blabla',
                                :description => "")
-	end
+  end
   should 'describe itself' do
     assert_not_equal Block.description, ProfileDescriptionBlock.description
@@ -17,7 +17,7 @@ class ProfileDescriptionBlockTest &lt; ActiveSupport::TestCase
   should "show profile description inside block" do
     new_block = ProfileDescriptionBlock.create!
     @profile.boxes.first.blocks << new_block
-    block_menssage = "Description field are empty"
+    block_menssage = "Description field is empty"
     assert (instance_eval(&Block.last.content).include?(block_menssage)),
       "description block doesn't show not found description message"
     description = "This is an test"
 Feature: require authentication to comment
   Background:
-    Given plugin RequireAuthToCommentPlugin is enabled on environment
+    Given plugin RequireAuthToComment is enabled on environment
     And the following users
       | login   |
       | bozo    |
@@ -3,4 +3,8 @@ require_dependency &#39;profile&#39;
 class Profile
   settings_items :allow_unauthenticated_comments, :type => :boolean
   attr_accessible :allow_unauthenticated_comments
+
+  descendants.each do |descendant|
+    descendant.attr_accessible :allow_unauthenticated_comments
+  end
 end
@@ -60,13 +60,14 @@ class StoaPlugin &lt; Noosfero::Plugin
   end
   def account_controller_filters
-    block = lambda do |context|
+    block = proc do
       params[:profile_data] ||= {}
       params[:profile_data][:invitation_code] = params[:invitation_code]
       invitation = Task.pending.find(:first, :conditions => {:code => params[:invitation_code]})
       if request.post?
         if !invitation && !StoaPlugin::UspUser.matches?(params[:profile_data][:usp_id], params[:confirmation_field], params[params[:confirmation_field]])
-          @person = Person.new(:environment => context.environment)
+          # `self` below is evaluated in the context of account_controller
+          @person = Person.new(:environment => self.environment)
           @person.errors.add(:usp_id, _(' validation failed'))
           render :action => :signup
         end
@@ -16,7 +16,7 @@ class StoaPlugin::PersonApi &lt; Noosfero::FieldsDecorator
   end
   def homepage
-    context.url_for(url)
+    profile_homepage(context, object)
   end
   def birth_date
@@ -35,6 +35,16 @@ class StoaPlugin::PersonApi &lt; Noosfero::FieldsDecorator
   end
   def communities
-    object.communities.public.map {|community| {:url => context.url_for(community.url), :name => community.name}}
+    object.communities.public.map {|community| {:url => profile_homepage(context, community), :name => community.name}}
+  end
+
+  private
+
+  def profile_homepage(context, profile)
+    if context.respond_to?(:url_for)
+      context.url_for(profile.url)
+    else
+      profile.environment.top_url + '/' + profile.identifier
+    end
   end
 end
@@ -57,7 +57,7 @@ class InviteControllerTest &lt; ActionController::TestCase
     organization.add_admin(admin)
     login_as(admin.identifier)
-    get :search_friend, :profile => organization.identifier, :q => '1234'
+    get :search, :profile => organization.identifier, :q => '1234'
     assert_equal [{"id" => person.id, "name" => person.name}].to_json, @response.body
     assert_response 200
@@ -29,6 +29,7 @@ Feature: sub_organizations_display
       And I follow "Manage sub-groups"
       And I follow "Register a new sub-enterprise"
       And I fill in "Name" with "Bart"
+      And I fill in "Address" with "bart"
       And I press "Next"
       Then I should see "Enterprise registration completed"
       And I am logged in as admin
@@ -2,4 +2,5 @@ require_dependency &#39;create_enterprise&#39;
 class CreateEnterprise
   settings_items :sub_organizations_plugin_parent_to_be
+  DATA_FIELDS << 'sub_organizations_plugin_parent_to_be'
 end
@@ -7,8 +7,8 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2013-12-10 15:48-0300\n"
-"PO-Revision-Date: 2015-02-23 11:33+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"PO-Revision-Date: 2015-03-23 19:30+0200\n"
+"Last-Translator: Jérôme Jutteau <j.jutteau@gmail.com>\n"
 "Language-Team: French "
 "<https://hosted.weblate.org/projects/noosfero/documentation/fr/>\n"
 "Language: fr\n"
@@ -36,7 +36,7 @@ msgstr &quot;&quot;
 #: doc/noosfero/plugins/google_cse.en.xhtml:3
 #: doc/noosfero/plugins/google_analytics.en.xhtml:3
 msgid "Usage"
-msgstr ""
+msgstr "Utilisation"
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
@@ -45,6 +45,8 @@ msgid &quot;&quot;
 "Create a <span class=\"caps\">HTML</span> form using RawHTMLBlock or "
 "RawHTMLArticle that invokes the {sendemail} action"
 msgstr ""
+"Créer un formulaire <span class=\"caps\">HTML</span> utilisant RawHTMLBlock "
+"ou RawHTMLArticle qui appel l'action {sendemail}"
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
@@ -7,7 +7,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.0-690-gcb6e853\n"
 "POT-Creation-Date: 2015-03-05 12:10-0300\n"
-"PO-Revision-Date: 2015-03-16 23:06+0200\n"
+"PO-Revision-Date: 2015-03-23 22:59+0200\n"
 "Last-Translator: TWS <tablettws@gmail.com>\n"
 "Language-Team: Italian "
 "<https://hosted.weblate.org/projects/noosfero/noosfero/it/>\n"
@@ -6093,9 +6093,8 @@ msgid &quot;Offline&quot;
 msgstr ""
 #: app/views/shared/logged_in/xmpp_chat.html.erb:60
-#, fuzzy
 msgid "Join room"
-msgstr "Accedere"
+msgstr "Accedere alla stanza"
 #: app/views/shared/logged_in/xmpp_chat.html.erb:61
 msgid "Leave room"
@@ -13,8 +13,8 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.0-690-gcb6e853\n"
 "POT-Creation-Date: 2015-03-05 12:10-0300\n"
-"PO-Revision-Date: 2015-03-17 21:44+0200\n"
-"Last-Translator: Evandro Junior <evandrojr@gmail.com>\n"
+"PO-Revision-Date: 2015-03-29 01:47+0200\n"
+"Last-Translator: daniel <dtygel@eita.org.br>\n"
 "Language-Team: Portuguese "
 "<https://hosted.weblate.org/projects/noosfero/noosfero/pt/>\n"
 "Language: pt\n"
@@ -7281,7 +7281,7 @@ msgstr &quot;Seu nome&quot;
 #: app/views/cms/_upload_file_form.html.erb:4
 #: app/views/cms/_text_editor_sidebar.html.erb:16
 msgid "Choose folder to upload files:"
-msgstr "Escolha uma pasta para incluir arquivos:"
+msgstr "O arquivo ficará na seguinte pasta:"
 #: app/views/cms/_upload_file_form.html.erb:16
 msgid "More files"
@@ -7535,7 +7535,7 @@ msgstr &quot;Houve problemas com os seguintes arquivos:&quot;
 #: app/views/cms/upload_files.html.erb:15
 msgid "Publish media"
-msgstr "Publicar mídia"
+msgstr "Publicar imagem ou documento"
 #: app/views/cms/upload_files.html.erb:17
 msgid "Select the files you want to upload (max size %s):"
@@ -7551,7 +7551,7 @@ msgstr &quot;Enviando arquivos para %s&quot;
 #: app/views/cms/_text_editor_sidebar.html.erb:8
 msgid "Insert media"
-msgstr "Adicionar mídia"
+msgstr "Adicionar imagem ou documento"
 #: app/views/cms/_text_editor_sidebar.html.erb:8
 msgid "Show/Hide"
@@ -7559,7 +7559,7 @@ msgstr &quot;Mostrar/Ocultar&quot;
 #: app/views/cms/_text_editor_sidebar.html.erb:21
 msgid "New folder"
-msgstr "Nova pasta"
+msgstr "Criar pasta"
 #: app/views/cms/_text_editor_sidebar.html.erb:26
 msgid "Hide all uploads"
@@ -85,7 +85,7 @@ environments_loop() {
 }
 do_running() {
-  pids=$(cat tmp/pids/thin.*.pid 2>/dev/null || true)
+  pids=$(sed "s/.*/& /" tmp/pids/thin.*.pid | tr -d '\n' 2>/dev/null || true)
   # passes if any of $pids exist, fails otherwise
   kill -0 $pids > /dev/null 2>&1
 }
@@ -114,7 +114,9 @@ else
   rails runner 'Environment.default.enable("skip_new_user_email_confirmation")'
 fi
-run quiet rake noosfero:translations:compile
+if [ ! -d locale ]; then
+  run quiet rake noosfero:translations:compile
+fi
 # create needed directory
 mkdir -p tmp/pids
@@ -699,7 +699,7 @@ class CmsControllerTest &lt; ActionController::TestCase
     xhr :get, :update_categories, :profile => profile.identifier, :category_id => top.id
     assert_template 'shared/update_categories'
     assert_equal top, assigns(:current_category)
-    assert_equal [c1, c2], assigns(:categories)
+    assert_equivalent [c1, c2], assigns(:categories)
   end
   should 'record when coming from public view on edit' do
@@ -131,7 +131,7 @@ class ContactControllerTest &lt; ActionController::TestCase
     post :new, :profile => community.identifier
     assert_response :forbidden
-    assert_template :access_denied
+    assert_template :private_profile
   end
   should 'not show send e-mail page to non members of invisible community' do
@@ -60,7 +60,7 @@ class EventsControllerTest &lt; ActionController::TestCase
     post :events, :profile => community.identifier
     assert_response :forbidden
-    assert_template :access_denied
+    assert_template :private_profile
   end
   should 'not show events page to non members of invisible community' do
@@ -204,7 +204,7 @@ class SearchControllerTest &lt; ActionController::TestCase
   end
   should 'paginate enterprise listing' do
-    @controller.expects(:limit).returns(1)
+    @controller.expects(:limit).returns(1).at_least_once
     ent1 = create_profile_with_optional_category(Enterprise, 'teste 1')
     ent2 = create_profile_with_optional_category(Enterprise, 'teste 2')
@@ -1,41 +0,0 @@
-require_relative "../test_helper"
-
-class CategoriesMenuTest < ActionController::IntegrationTest
-
-  def setup
-    HomeController.any_instance.stubs(:get_layout).returns('application')
-    SearchController.any_instance.stubs(:get_layout).returns('application')
-
-    Category.delete_all
-    @cat1 = Category.create!(:display_in_menu => true, :name => 'Food', :environment => Environment.default, :display_color => '#888a85')
-    @cat2 = Category.create!(:display_in_menu => true, :name => 'Vegetables', :environment => Environment.default, :parent => @cat1)
-
-    # all categories must be shown for these tests 
-    Category.any_instance.stubs(:display_in_menu?).returns(true)
-  end
-
-  should 'display link to categories' do
-    get '/'
-    assert_tag :attributes => { :id => 'cat_menu' }, :descendant => { :tag => 'a', :attributes => { :href => '/cat/food/vegetables' } }
-  end
-
-  should 'display link to sub-categories' do
-    get '/cat/food'
-    # there must be a link to the subcategory
-    assert_tag :attributes => { :id => 'cat_menu' }, :descendant => { :tag => 'a', :attributes => { :href => '/cat/food/vegetables' } }
-  end
-
-  should "always link to category's initial page in category menu" do
-    get '/search/products/food/vegetables'
-    assert_tag :attributes => { :id => 'cat_menu' }, :descendant => { :tag => 'a', :attributes => { :href => '/cat/food/vegetables' } }
-    assert_no_tag :attributes => { :id => 'cat_menu' }, :descendant => { :tag => 'a', :attributes => { :href => '/searchh/products/food/vegetables' } }
-  end
-
-  should 'cache the categories menu' do
-    ActionController::Base.perform_caching = true
-    HomeController.any_instance.stubs(:fragment_cache_key).with(Environment.default.id.to_s + "_categories_menu").returns('dir')
-    get '/'
-    ActionController::Base.perform_caching = false
-  end
-
-end
@@ -3,6 +3,7 @@ require &#39;boxes_helper&#39;
 class BoxesHelperTest < ActionView::TestCase
+  include ApplicationHelper
   include BoxesHelper
   include ActionView::Helpers::TagHelper
@@ -181,4 +182,20 @@ class BoxesHelperTest &lt; ActionView::TestCase
     display_box_content(box, '')
   end
+  should 'display embed button when a block is embedable' do
+    box = create(Box, position: 1, owner: fast_create(Profile))
+    block = Block.create!(:box => box)
+    block.stubs(:embedable?).returns(true)
+    stubs(:url_for).returns('')
+    assert_tag_in_string block_edit_buttons(block), :tag => 'a', :attributes => {:class => 'button icon-button icon-embed '}
+  end
+
+  should 'not display embed button when a block is not embedable' do
+    box = create(Box, position: 1, owner: fast_create(Profile))
+    block = Block.create!(:box => box)
+    block.stubs(:embedable?).returns(false)
+    stubs(:url_for).returns('')
+    assert_no_tag_in_string block_edit_buttons(block), :tag => 'a', :attributes => {:class => 'button icon-button icon-embed '}
+  end
+
 end
@@ -110,6 +110,16 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert_equal total - mine, Article.count
   end
+  should 'remove images when removing profile' do
+    profile = build(Profile, :image_builder => {:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')})
+    image = profile.image
+    image.save!
+    profile.destroy
+    assert_raise ActiveRecord::RecordNotFound do
+      image.reload
+    end
+  end
+
   def test_should_avoid_reserved_identifiers
     Profile::RESERVED_IDENTIFIERS.each do |identifier|
       assert_invalid_identifier identifier
	@@ -19,3 +19,12 @@		@@ -19,3 +19,12 @@
19	[submodule "plugins/site_tour"]	19	[submodule "plugins/site_tour"]
20	path = plugins/site_tour	20	path = plugins/site_tour
21	url = git@gitlab.com:noosfero-plugins/site_tour.git	21	url = git@gitlab.com:noosfero-plugins/site_tour.git
		22	+[submodule "plugins/gamification"]
		23	+ path = plugins/gamification
		24	+ url = git@gitlab.com:noosfero-plugins/gamification.git
		25	+[submodule "plugins/comment_paragraph"]
		26	+ path = plugins/comment_paragraph
		27	+ url = git@gitlab.com:noosfero-plugins/comment-paragraph.git
		28	+[submodule "plugins/notification"]
		29	+ path = plugins/notification
		30	+ url = git@gitlab.com:noosfero-plugins/notification.git
	@@ -62,7 +62,7 @@ class SearchController < PublicController		@@ -62,7 +62,7 @@ class SearchController < PublicController
62	end	62	end
63		63
64	def articles	64	def articles
65	- @scope = @environment.articles.public.paginate(paginate_options)	65	+ @scope = @environment.articles.public
66	full_text_search	66	full_text_search
67	end	67	end
68		68
	@@ -76,7 +76,7 @@ class SearchController < PublicController		@@ -76,7 +76,7 @@ class SearchController < PublicController
76	end	76	end
77		77
78	def products	78	def products
79	- @scope = @environment.products.paginate(paginate_options)	79	+ @scope = @environment.products
80	full_text_search	80	full_text_search
81	end	81	end
82		82
	@@ -244,7 +244,7 @@ class SearchController < PublicController		@@ -244,7 +244,7 @@ class SearchController < PublicController
244	def visible_profiles(klass, *extra_relations)	244	def visible_profiles(klass, *extra_relations)
245	relations = [:image, :domains, :environment, :preferred_domain]	245	relations = [:image, :domains, :environment, :preferred_domain]
246	relations += extra_relations	246	relations += extra_relations
247	- @environment.send(klass.name.underscore.pluralize).visible.includes(relations).paginate(paginate_options)	247	+ @environment.send(klass.name.underscore.pluralize).visible.includes(relations)
248	end	248	end
249		249
250	def per_page	250	def per_page
	@@ -271,7 +271,7 @@ module BoxesHelper		@@ -271,7 +271,7 @@ module BoxesHelper
271	content_tag('div', _('Below, you''ll see a field containing embed code for the block. Just copy the code and paste it into your website or blogging software.'), :style => 'margin-bottom: 1em;') +	271	content_tag('div', _('Below, you''ll see a field containing embed code for the block. Just copy the code and paste it into your website or blogging software.'), :style => 'margin-bottom: 1em;') +
272	content_tag('textarea', embed_code, :style => 'margin-bottom: 1em; width:100%; height:40%;', :readonly => 'readonly') +	272	content_tag('textarea', embed_code, :style => 'margin-bottom: 1em; width:100%; height:40%;', :readonly => 'readonly') +
273	modal_close_button(_('Close')), :style => 'display: none;', :id => "embed-code-box-#{block.id}")	273	modal_close_button(_('Close')), :style => 'display: none;', :id => "embed-code-box-#{block.id}")
274	- buttons << modal_inline_icon(:embed, _('Embed code'), {}, "embed-code-box-#{block.id}") << html	274	+ buttons << modal_inline_icon(:embed, _('Embed code'), {}, "#embed-code-box-#{block.id}") << html
275	end	275	end
276		276
277	content_tag('div', buttons.join("\n") + tag('br', :style => 'clear: left'), :class => 'button-bar')	277	content_tag('div', buttons.join("\n") + tag('br', :style => 'clear: left'), :class => 'button-bar')
1	-jQuery('#search-content').html('<%= escape_javascript(render :partial => "search_content") %>');	1	+jQuery('#search-content').replaceWith('<%= escape_javascript(render "search_content") %>');
		2	+
	@@ -1,2 +0,0 @@	@@ -1,2 +0,0 @@
1	-# Load newrelic agent if its config file is defined.
2	-require 'newrelic_rpm' if File.exist?(File.dirname(__FILE__) + '/../newrelic.yml')
		1	+noosfero (1.1~rc4) wheezy; urgency=medium
		2	+
		3	+ * Fourth release candidate for Noosfero 1.1
		4	+
		5	+ -- Antonio Terceiro <terceiro@debian.org> Wed, 01 Apr 2015 12:22:36 -0300
		6	+
1	noosfero (1.1~rc2) wheezy; urgency=low	7	noosfero (1.1~rc2) wheezy; urgency=low
2		8
3	* Second release candidate for Noosfero 1.1	9	* Second release candidate for Noosfero 1.1
	@@ -207,18 +207,3 @@ Feature: login		@@ -207,18 +207,3 @@ Feature: login
207	\| Password \| 123456 \|	207	\| Password \| 123456 \|
208	When I press "Log in"	208	When I press "Log in"
209	Then I should be on joaosilva's control panel	209	Then I should be on joaosilva's control panel
210	-
211	- Scenario: join community on login
212	- Given the following users
213	- \| login \| name \|
214	- \| mariasilva \| Maria Silva \|
215	- And the following communities
216	- \| name \| identifier \| owner \|
217	- \| Free Software \| freesoftware \| mariasilva \|
218	- And I am on /freesoftware
219	- When I follow "Join"
220	- And I fill in the following:
221	- \| Username / Email \| joaosilva \|
222	- \| Password \| 123456 \|
223	- And I press "Log in"
224	- Then "Joao Silva" should be a member of "Free Software"
	@@ -293,6 +293,7 @@ Given /^I am logged in as "(.+)"$/ do \|username\|		@@ -293,6 +293,7 @@ Given /^I am logged in as "(.+)"$/ do \|username\|
293	When %{I press "Log in"}	293	When %{I press "Log in"}
294	And %{I go to #{username}'s control panel}	294	And %{I go to #{username}'s control panel}
295	Then %{I should be on #{username}'s control panel}	295	Then %{I should be on #{username}'s control panel}
		296	+ @current_user = username
296	end	297	end
297		298
298	Given /^"([^"]*)" is environment admin$/ do \|person\|	299	Given /^"([^"]*)" is environment admin$/ do \|person\|
1	module Noosfero	1	module Noosfero
2	PROJECT = 'noosfero'	2	PROJECT = 'noosfero'
3	- VERSION = '1.1~rc2'	3	+ VERSION = '1.1~rc4'
4	end	4	end
5		5
6	root = File.expand_path(File.dirname(__FILE__) + '/../..')	6	root = File.expand_path(File.dirname(__FILE__) + '/../..')
	@@ -4,7 +4,6 @@ $broken_plugins = %w[		@@ -4,7 +4,6 @@ $broken_plugins = %w[
4	comment_classification	4	comment_classification
5	ldap	5	ldap
6	solr	6	solr
7	- stoa
8	]	7	]
9		8
10	@all_plugins = Dir.glob('plugins/*').map { \|f\| File.basename(f) } - ['template']	9	@all_plugins = Dir.glob('plugins/*').map { \|f\| File.basename(f) } - ['template']