13 Apr, 2016

1 commit

  • d755b3b7   New feature archive articles ... Browse File » 
    - Avoid create comments, associate children articles and perform votes on archived articles
- Update db/schema

-Signed-off-by: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
-Signed-off-by: Gustavo Jaruga Cruz <darksshades@gmail.com>
-Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>

(cherry picked from commit 144d608f15e2864e8053d384e871699d314a9283)
    Michel Felipe
     

08 Apr, 2016

1 commit

23 Feb, 2016

1 commit

12 Dec, 2015

1 commit

03 Nov, 2015

1 commit

07 Oct, 2015

1 commit

  • 66eb5163   New topics now accepts reply by default ... Browse File » 
    Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com>
Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
Signed-off-by: Jessica Cristina <jessica.cris1127@gmail.com>
Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Simiao Carvalho
     

02 Oct, 2015

1 commit

24 Sep, 2015

1 commit

  • ef41c154   Allow user to remove article or profile image ... Browse File »
    2 
    Additional improvements include:

- Makes 'Remove Image' checkbox optional
- Very ugly css hack to hide duplicated labels in some forms. I couldn't
find another way to avoid the labels generated by labelled_form_for nor
could I skip adding labels inside the helper since it's supposed to be
generic.
    Larissa Reis
     

11 Sep, 2015

1 commit

02 Sep, 2015

1 commit

  • 04576c7e   Fix clone article behavior ... Browse File » 
    Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Omar Júnior <omarroinuj@gmail.com>
Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: Vítor Barbosa <vitornga15@gmail.com>
    Vitor Barbosa de Araujo
     

13 Aug, 2015

1 commit

31 Jul, 2015

1 commit

24 Jul, 2015

2 commits

25 Jun, 2015

1 commit

17 Jun, 2015

1 commit

  • 5ee24034   Refactoring article content visualization ... Browse File » 
      - Added image label
  - Added image to article body
  - Changed some minor positioning

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fábio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    André Guedes
     

26 May, 2015

1 commit

27 Apr, 2015

1 commit

24 Apr, 2015

2 commits

25 Mar, 2015

1 commit

23 Feb, 2015

1 commit

22 Feb, 2015

2 commits

10 Feb, 2015

1 commit

03 Feb, 2015

1 commit

  • 71439c6c   Merge branch 'master' into stoa ... Browse File » 
    Conflicts:
	app/controllers/my_profile/profile_editor_controller.rb
	app/helpers/search_helper.rb
	app/models/invitation.rb
	app/models/person.rb
	app/views/cms/view.html.erb
	app/views/templates/index.html.erb
	plugins/community_track/views/content_viewer/_step_item.html.erb
	test/functional/home_controller_test.rb
	test/unit/person_test.rb
	test/unit/profile_test.rb
    Rodrigo Souto
     

30 Jan, 2015

1 commit

27 Jan, 2015

1 commit

26 Jan, 2015

1 commit

16 Jan, 2015

1 commit

14 Jan, 2015

1 commit

12 Jan, 2015

3 commits

26 Aug, 2014

1 commit

07 Aug, 2014

1 commit

  • 34f8f4d7   Merge remote-tracking branch 'origin/stable' ... Browse File » 
    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
     

31 Jul, 2014

1 commit

28 Jul, 2014

1 commit

23 Jul, 2014

1 commit

26 Jun, 2014

1 commit