13 Oct, 2014

1 commit

07 Oct, 2014

2 commits

30 Sep, 2014

1 commit

26 Sep, 2014

1 commit

24 Sep, 2014

1 commit

22 Sep, 2014

1 commit

18 Sep, 2014

1 commit

12 Sep, 2014

1 commit

11 Sep, 2014

1 commit

01 Sep, 2014

1 commit

29 Aug, 2014

1 commit

27 Aug, 2014

1 commit

25 Aug, 2014

1 commit

20 Aug, 2014

1 commit

  • ee4b142a   AI3036 Code Refactoring ... Browse Dir » 
    Modified conditional to be more logical on User model.
Renamed moderation task to a more intuitive name.
Added unit test for moderate_user_registration task.

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    André Guedes
     

19 Aug, 2014

1 commit

18 Aug, 2014

1 commit

15 Aug, 2014

1 commit

14 Aug, 2014

1 commit

11 Aug, 2014

8 commits

08 Aug, 2014

7 commits

07 Aug, 2014

2 commits

  • 8f79b72d   Change the category color selection to use a colorpicker component. ... Browse Dir » 
    The field display_color has turned into char(6) and stores the color rgb hex code.
(ActionItem2915)
    Victor Costa
     
  • 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
     

31 Jul, 2014

1 commit

30 Jul, 2014

1 commit

29 Jul, 2014

1 commit

28 Jul, 2014

1 commit