17 Jul, 2016

1 commit


22 Feb, 2016

1 commit

  • - Every article can be followed so the user can receive notifications without
      having to comment on it
    
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
    Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
    Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
    Signed-off-by: Carlos Purificacao <carloseugenio@gmail.com>
    Signed-off-by: Victor Costa <vfcosta@gmail.com>
    Signed-off-by: Caio SBA <caio@colivre.coop.br>
    Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
    Signed-off-by: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
    Signed-off-by: Evandro Jr <evandrojr@gmail.com>
    Marcos Ramos
     

13 Aug, 2015

1 commit


31 Jul, 2015

1 commit


24 Jul, 2015

1 commit


26 Jan, 2015

1 commit


31 Oct, 2014

1 commit


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
     

23 Jul, 2014

1 commit


29 Jan, 2014

1 commit


22 Jan, 2014

1 commit


20 Jan, 2014

1 commit


17 Jul, 2013

1 commit


13 Jul, 2013

1 commit


12 Jul, 2013

2 commits


08 Jul, 2013

2 commits


15 May, 2013

1 commit


20 Feb, 2013

1 commit