07 Mar, 2014

2 commits

05 Mar, 2014

1 commit

03 Mar, 2014

1 commit

02 Mar, 2014

2 commits

28 Feb, 2014

1 commit

21 Feb, 2014

2 commits

20 Feb, 2014

2 commits

19 Feb, 2014

1 commit

18 Feb, 2014

2 commits

14 Feb, 2014

1 commit

13 Feb, 2014

6 commits

12 Feb, 2014

1 commit

11 Feb, 2014

8 commits

  • c51270d7   users-controller: default filter to all_users ... Browse Dir » 
    (ActionItem2995)
    Rodrigo Souto
     
  • f8b1f66d   users-controller: order users by name ... Browse Dir » 
    Also adding a new assert helper to test the order of a collection
without assuming all elements inside it.

(ActionItem2996)
    Rodrigo Souto
     
  • 27ef9853   Don't duplicate themes Browse Dir »
    Braulio Bhavamitra
     
  • 1f0194be   Merge branch 'master' into rails3-merge ... Browse Dir » 
    Conflicts:
	app/views/profile_themes/add_css.rhtml
	app/views/profile_themes/add_image.rhtml
	app/views/profile_themes/css_editor.rhtml
	app/views/profile_themes/edit.rhtml
	app/views/profile_themes/new.rhtml
	app/views/themes/add_css.html.erb
	app/views/themes/add_css.rhtml
	app/views/themes/add_image.html.erb
	app/views/themes/add_image.rhtml
	app/views/themes/css_editor.html.erb
	app/views/themes/css_editor.rhtml
	app/views/themes/edit.html.erb
	app/views/themes/edit.rhtml
	app/views/themes/index.html.erb
	app/views/themes/new.html.erb
	app/views/themes/new.rhtml
	test/factories.rb
	test/functional/profile_themes_controller_test.rb
    Rodrigo Souto
     
  • 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
     
  • a03f0c92   rails3: fix some cucumber tests Browse Dir »
    Victor Costa
     
  • 712b5f51   Merge branch 'ai2977' into 'stable' ... Browse Dir » 
    Don't render layout for javascript format

This is the default behaviour for Rails when rendering .js.erb files. Check http://stackoverflow.com/questions/4060300/when-rendering-js-erb-file-it-renders-layout-with-the-javascript-is-it-a-bug
    Rodrigo Souto
     
  • e066c0a5   Merge branch 'ai2961' into 'stable' ... Browse Dir » 
    Remove extra div close tag on location block

http://noosfero.org/Development/ActionItem2961
    Rodrigo Souto
     

10 Feb, 2014

4 commits

08 Feb, 2014

1 commit

06 Feb, 2014

1 commit

05 Feb, 2014

4 commits