13 Aug, 2015

1 commit

31 Jul, 2015

1 commit

24 Jul, 2015

1 commit

  • 1ea6b1cb   rails4: change require on tests ... Browse Dir » 
    Use these two commands inside vim:
:!ag -l '..\/..\/..\/..\/test' | xargs perl -pi -E "s/require.*test_helper.*/require 'test_helper'/g"
:!ag -l "require File.*'/" | xargs perl -pi -E "s/require File.*'\//require_relative '/g":e ""'"
    Braulio Bhavamitra
     

09 Feb, 2015

1 commit

28 Jan, 2015

1 commit

12 May, 2014

1 commit

16 Mar, 2014

1 commit

13 Mar, 2014

1 commit

12 Mar, 2014

2 commits

07 Mar, 2014

5 commits

05 Mar, 2014

1 commit

02 Mar, 2014

1 commit

01 Mar, 2014

2 commits

28 Feb, 2014

1 commit

21 Feb, 2014

3 commits

13 Feb, 2014

4 commits

11 Feb, 2014

2 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
     

10 Feb, 2014

2 commits

08 Feb, 2014

1 commit

06 Feb, 2014

1 commit

04 Feb, 2014

1 commit

03 Feb, 2014

3 commits

29 Jan, 2014

2 commits

28 Jan, 2014

1 commit