21 Jan, 2015

5 commits

  • 0c38e980   Adds ClassCommunityPlugin ... Browse Dir » 
    Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Aurélio A. Heckert <aurelio@colivre.coop.br>
    Arthur Esposte
     
  • a6151343   Merge branch 'article_privacity_to_followers' into 'master' ... Browse Dir » 
    Article privacity to followers

https://gitlab.com/participa/noosfero/issues/324

Feitos para amigos de perfis de pessoas também!

See merge request !422
    Antonio Terceiro
     
  • 7eefa439   Merge branch 'fixed-block' into 'master' ... Browse Dir » 
    Fixed block

Make a specific block fixed on a position. Only the environment admin can move and specify this option for the block

https://gitlab.com/noosfero/noosfero/issues/26

See merge request !380
    Antonio Terceiro
     
  • 5d28b4b3   Add ability to mark blocks as fixed ... Browse Dir » 
    Fixed blocks can't be modified by regular users, but only by
administrators. The main use case is defining a few blocks in the user
or community templates, so that users and communities can't remove or
change them.

Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
    Fabio Teixeira
     
  • b3068b11   Add option to all community and users followers view a private article ... Browse Dir » 
    Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
    Gabriela Navarro
     

20 Jan, 2015

2 commits

  • 46080e93   Merge branch 'AI3287_deactive_and_active_profile' into 'master' ... Browse Dir » 
    Ai3287 deactive and active profile

Feature: https://noosfero.org/Development/ActionItem3287

This patch add the activate/deactivate feature for organizations. It also add a new administrator feature to manage organizations status in admin pannel.

See merge request !357
    Antonio Terceiro
     
  • 6984558b   Add UI to activate and deactivate profiles ... Browse Dir » 
    (ActionItem3287)
It can be done while edit a profile or in environment administration panel

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Parley Martins <parley@outlook.com>
    Fabio Teixeira
     

19 Jan, 2015

1 commit

08 Dec, 2014

1 commit

20 Nov, 2014

1 commit

31 Oct, 2014

1 commit

27 Oct, 2014

1 commit

22 Oct, 2014

3 commits

20 Oct, 2014

1 commit

26 Sep, 2014

3 commits

24 Sep, 2014

1 commit

15 Sep, 2014

1 commit

12 Sep, 2014

2 commits

02 Sep, 2014

1 commit

27 Aug, 2014

1 commit

26 Aug, 2014

1 commit

18 Aug, 2014

1 commit

14 Aug, 2014

1 commit

13 Aug, 2014

1 commit

12 Aug, 2014

1 commit

11 Aug, 2014

1 commit

07 Aug, 2014

1 commit

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

2 commits

23 Jul, 2014

2 commits

22 Jul, 2014

1 commit

  • 4bbfef7e   article: author refactoring ... Browse Dir » 
    I'm adding the author as a record relation instead of calculating it
based on the last_changed_by. This change has a reasonable performance
improvement on pages that access this information, like blog page.

Still saving author_name in order to deal with the problem of the author
being removed.

Including new method to facilitate specific article version retrieval.

ActionItem3201
    Rodrigo Souto
     

21 Jul, 2014

1 commit

17 Jul, 2014

1 commit