22 Jan, 2015

2 commits

21 Jan, 2015

10 commits

  • 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
     
  • c9b33c17   Refactoring Work Assignment Plugin ... Browse Dir » 
    - Changed methods and variable names.
- Created work_assignment_plugin_myprofile_controller and undone the cms_controller extension
- Fixed the tests to fit the new structure

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
    Tallys Martins
     
  • cbed32d2   Refactoring Work Assignment Plugin ... Browse Dir » 
    - Changed article_extra_fields hotspot name to upload_files_extra_fields
- Fixed some code spacing.
- Fixed uploaded file filter on plugin class
- Fixed after_validation filter on UploadedFile plugin extension class

Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com>
Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Hebert Douglas <hebertdougl@gmail>
    Tallys Martins
     
  • ae016525   Writting and fixing Work Assignment Plugin tests ... Browse Dir » 
    - Written tests of work_assignment cms controller.
- Fixed failures on unit tests
- Removed empy lines, spaces and useless code.
- Fixing bugs on edit_visibility filters

Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: Dylan Guedes <djmgguedes@gmail.com>
Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com>
Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Hebert Douglas <hebertdougl@gmail>
    Dylan Guedes
     
  • 7aab108a   Refactoring work assignment plugin ... Browse Dir » 
    Changed privacy edition box to open on a new page.
Fixed cancel buttom to redirect to back page.

    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com>
    Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
    Tallys Martins
     
  • dfed6005   WorkAssignment privacy edition now works for all users ... Browse Dir » 
    Refactored Cms Controller inheritance on Work Assignment Plugin.
Added a new method on Cms controller that is extended on Work Assignment Plugin and can allow a plugin action to by pass
the static before filter generated on Cms that denies any other actions outside it's list.
Added a before filter on plugin cms controller  that allows the visibility edition only for the article author and admins.

Signed-off-by Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: Arhur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
    Tallys Martins
     
  • 1db348b8   WorkAssignment submissions visibility edition is now working for admins user ... Browse Dir » 
    - Refactored the name of the action to edit_visibility
- Refactored edit_visibility behavior to apply privacy to also the Folder's children
- Fixed bug on plugin content_viewer filter not passing the right path of article

Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
Signed-off-by: Dylan Guedes <djmgguedes@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Marcos Pereira
     
  • e6c0328a   Refactoring Work Assignment ... Browse Dir » 
    Added filters to cms controller to send email
Removed unecessary dispatch on cms controller

Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Tallys Martins
     
  • 27831399   Fixing bugs on Work Assignment plugin ... Browse Dir » 
    - Removed useless view.
- Fixed problem on page render when file error(e.g. over max size) is detected.
- Fixed bug when no file selected.
- Refactored dispatch on upload_files.html.erb  to have less impact on core.
- Added java script to modify the form action to use the plugin controller on upload_files form.
- Fixed Work Assignment not sending e-mails
- Removing duplicated code
- Added new dispatch on cms_controller

Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Tallys Martins
     

20 Jan, 2015

1 commit

  • 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
     

12 Jan, 2015

1 commit

08 Dec, 2014

3 commits

12 Sep, 2014

1 commit

09 Sep, 2014

1 commit

26 Aug, 2014

1 commit

25 Aug, 2014

1 commit

20 Aug, 2014

2 commits

08 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

3 commits

27 Jul, 2014

1 commit

24 Jul, 2014

1 commit

23 Jul, 2014

1 commit

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
     

16 Jul, 2014

1 commit

16 Jun, 2014

1 commit

15 Jun, 2014

2 commits

14 Jun, 2014

1 commit

05 Jun, 2014

1 commit

22 May, 2014

1 commit