16 Mar, 2016

1 commit

20 Jan, 2016

1 commit

13 Aug, 2015

1 commit

31 Jul, 2015

1 commit

24 Jul, 2015

2 commits

12 Feb, 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
     

13 Aug, 2014

1 commit

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
     

09 Jul, 2014

1 commit

20 Jun, 2014

1 commit

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

27 Jan, 2014

1 commit

20 Jan, 2014

1 commit

  • bfc0d0ed   Prevents new forms to be saved with select field without alternatives ... Browse Dir » 
      I had to put the validation for the length of alternatives in the
  Field model because, since we are using Single Table Inheritance,
  we are creating Field objects with the type as a param instead of
  creating SelectField objects. This way, subclass' validation are
  skipped.

  I kept the validation in the SelectField model as well, because we
  also edit existing SelectField objects.

(ActionItem2960)
    Larissa Reis
     

19 Jan, 2014

1 commit

11 Nov, 2013

4 commits

09 Nov, 2013

1 commit

06 Nov, 2013

1 commit

05 Nov, 2013

1 commit

21 Oct, 2013

1 commit

22 Aug, 2013

1 commit

05 Jul, 2013

1 commit

27 Feb, 2013

1 commit

21 Oct, 2012

2 commits

20 Oct, 2012

3 commits

13 Oct, 2012

2 commits

07 Oct, 2012

1 commit

01 Oct, 2012

1 commit

14 Sep, 2012

1 commit