01 Jun, 2015

1 commit

16 Mar, 2015

1 commit

13 Mar, 2015

1 commit

12 Mar, 2015

1 commit

09 Mar, 2015

4 commits

06 Mar, 2015

1 commit

05 Mar, 2015

1 commit

23 Feb, 2015

6 commits

22 Feb, 2015

1 commit

12 Feb, 2015

1 commit

02 Feb, 2015

1 commit

15 Jan, 2015

3 commits

09 Jan, 2015

1 commit

09 Nov, 2014

1 commit

  • 89d144e1   Fixes remaining custom_forms plugin broken tests ... Browse Dir » 
      fast_create(Person) used on tests leaves the user blank so the target
  for the email had no address causing deliver to throw an error, so I
  just replaced fast_create for create_user

  This patch just makes the tests pass. I haven't tested the plugin
  myself so I have no guarantee it works.
    Larissa Reis
     

03 Nov, 2014

1 commit

13 Aug, 2014

2 commits

07 Aug, 2014

1 commit

  • 34f8f4d7   Merge remote-tracking branch 'origin/stable' ... Browse Dir » 
    Hopefully this is the very last time we do this.

Conflicts:
	Rakefile
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/content_viewer_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/product_categories_block.rb
	app/models/products_block.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/my_network.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/blocks/profile_info_actions/_community.html.erb
	app/views/blocks/profile_info_actions/_enterprise.html.erb
	app/views/blocks/profile_info_actions/_person.html.erb
	app/views/content_viewer/view_page.rhtml
	app/views/profile/index.rhtml
	app/views/shared/_disabled_enterprise.html.erb
	app/views/shared/articles_list.html.erb
	db/schema.rb
	debian/changelog
	lib/file_presenter.rb
	lib/noosfero.rb
	plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
	plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin_test.rb
	public/javascripts/application.js
	script/sample-articles
	script/sample-enterprises
	script/sample-products
	script/sample-profiles
	test/functional/cms_controller_test.rb
	test/functional/comment_controller_test.rb
	test/functional/content_viewer_controller_test.rb
	test/unit/application_helper_test.rb
	test/unit/article_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/folder_helper_test.rb
	test/unit/forum_helper_test.rb
    Antonio Terceiro
     

06 Aug, 2014

3 commits

09 Jul, 2014

1 commit

20 Jun, 2014

2 commits

16 Jun, 2014

1 commit

13 May, 2014

1 commit

  • 23914711   Merge branch 'master' into rails3 ... Browse Dir » 
    Conflicts:
	app/helpers/application_helper.rb
	app/helpers/layout_helper.rb
	app/models/community.rb
	app/models/enterprise.rb
	app/models/product_category.rb
	app/views/account/change_password.html.erb
	config/boot.rb
	config/environment.rb
	config/routes.rb
	lib/noosfero/plugin.rb
	test/unit/enterprise_activation_test.rb
	test/unit/person_notifier_test.rb
    Rodrigo Souto
     

05 May, 2014

1 commit

  • 6ca84615   custom-forms-migration: remove/avoid submissions without a form ... Browse Dir » 
    The migration 20130823151900_associate_fields_to_alternatives.rb from
plugin CustomForms? was crashing due to submissions without a form on
the database. This is a database inconsistence since there shouldn't be
submissions without a form. To fix the problem I'm skipping the on the
migration which may crash with a rescue to allow new tries to execute
properly, creating a new migration to remove the submissions without
form from the database and adding the :dependent => :destroy on form
association with submission to avoid the problem in the future.

Some people bypassed the migration through manual ways. This people
should not worry since the cases which were crashing should not be
running at all.

ActionItem3130
    Rodrigo Souto
     

10 Mar, 2014

1 commit

11 Feb, 2014

1 commit

  • e9fea38f   Merge branch 'master' into rails3-merge ... Browse Dir » 
    Conflicts:
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/article_helper.rb
	app/helpers/catalog_helper.rb
	app/helpers/comment_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/members_block.rb
	app/models/person.rb
	app/models/profile.rb
	app/views/blocks/profile_info.html.erb
	app/views/blocks/profile_info_actions/community.html.erb
	config/initializers/dependencies.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	lib/tasks/plugins.rake
	plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
	script/sample-products
	test/functional/catalog_controller_test.rb
	test/functional/manage_products_controller_test.rb
	test/functional/map_balloon_controller_test.rb
	test/functional/profile_controller_test.rb
	test/functional/search_controller_test.rb
	test/unit/box_test.rb
	test/unit/cms_helper_test.rb
	test/unit/enterprise_test.rb
	test/unit/environment_test.rb
	test/unit/featured_products_block_test.rb
	test/unit/person_test.rb
	test/unit/product_category_test.rb
	test/unit/product_test.rb
	test/unit/profile_test.rb
	test/unit/user_test.rb
	vendor/plugins/monkey_patches/methods_from_fake_arel/init.rb
    Rodrigo Souto
     

27 Jan, 2014

1 commit

  • 9e954d8c   Merge branch 'master' into custom-forms ... Browse Dir » 
    Conflicts:
	plugins/custom_forms/test/functional/custom_forms_plugin_myprofile_controller_test.rb
	plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
	plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb
	po/pt/noosfero.po
    Rodrigo Souto