20 Nov, 2014

2 commits


18 Nov, 2014

1 commit


13 Nov, 2014

1 commit


07 Oct, 2014

1 commit


18 Sep, 2014

2 commits


11 Sep, 2014

1 commit

  • When the content being displayed is from the user, we should not display
    the "publish on my profile" option. The same goes for the "publish on
    communities" option if the user has no communities or the "publish on
    portal community" option if the environment has no portal community.
    
    If none of this options is available the spread button is also not
    displayed.
    Rodrigo Souto
     

09 Sep, 2014

2 commits


08 Sep, 2014

1 commit

  • Conflicts:
    	app/controllers/application_controller.rb
    	app/controllers/my_profile/memberships_controller.rb
    	app/controllers/public/account_controller.rb
    	app/helpers/application_helper.rb
    	app/helpers/layout_helper.rb
    	app/helpers/token_helper.rb
    	app/views/account/signup.html.erb
    	app/views/layouts/_javascript.html.erb
    	db/schema.rb
    	test/functional/application_controller_test.rb
    Rodrigo Souto
     

18 Aug, 2014

1 commit


14 Aug, 2014

1 commit


12 Aug, 2014

14 commits


11 Aug, 2014

1 commit


08 Aug, 2014

2 commits


07 Aug, 2014

1 commit

  • 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
     

04 Aug, 2014

1 commit


28 Jul, 2014

1 commit


22 Jul, 2014

1 commit


21 Jul, 2014

1 commit


09 Jul, 2014

1 commit


05 Jul, 2014

1 commit


30 Jun, 2014

2 commits


27 Jun, 2014

1 commit