29 Apr, 2014

1 commit

17 Mar, 2014

1 commit

13 Mar, 2014

5 commits

12 Mar, 2014

4 commits

11 Mar, 2014

1 commit

10 Mar, 2014

1 commit

07 Mar, 2014

3 commits

05 Mar, 2014

1 commit

03 Mar, 2014

1 commit

02 Mar, 2014

1 commit

19 Feb, 2014

1 commit

18 Feb, 2014

1 commit

11 Feb, 2014

3 commits

  • 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
     
  • 840db72a   Merge branch 'ai2981' into 'stable' ... Browse Dir » 
    Don't let firefox show broken images name breaking layout

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

10 Feb, 2014

2 commits

06 Feb, 2014

2 commits

31 Jan, 2014

1 commit

28 Jan, 2014

1 commit

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
     

23 Jan, 2014

6 commits

22 Jan, 2014

1 commit

  • ead32981   check_all_manage_fields: ... Browse Dir » 
    - When the field "check/uncheck all" is checked or unchecked, all fields below are checked or unchecked
 - Corrected onclick events on active/required/signup fields
 - Replaced javascript logic from person/community/enterprise to a single javascript file
 - Cucumber tests for check/uncheck all fields

(ActionItem2962)

Signed-off-by: Alex Campelo <campelo.al1@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fábio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gustavo Cruz <darksshades@hotmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com>
Signed-off-by: Renan Costa <renan2727@hotmail.com>
    Fabio Teixeira
     

21 Jan, 2014

2 commits