05 Jul, 2016

1 commit

16 May, 2016

1 commit

06 May, 2016

1 commit

04 May, 2016

1 commit

  • 7949d4e8   Adds required email moderation option ... Browse Dir »
    3 
    - Confirmation modal when joining community
- Moderation option in community control panel

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Alvaro Fernando <alvarofernandoms@gmail.com>
Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Marcos Pereira
     

22 Apr, 2016

1 commit

20 Apr, 2016

1 commit

18 Apr, 2016

1 commit

  • dab58951   Fixing html_safe for noosfero core ... Browse Dir » 
    Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Arthur Jahn <stutrzbecher@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Victor Costa <vfcosta@gmail.com>
    Carlos Purificação
     

15 Apr, 2016

1 commit

14 Apr, 2016

1 commit

01 Apr, 2016

1 commit

31 Mar, 2016

1 commit

23 Mar, 2016

1 commit

  • 355a1dfc   task: keep filters applied to tasks after close action ... Browse Dir » 
    - Rename TasksHelper file
- Referencing TasksHelper in TaskController
- Refactoring task_action/url helper method
- Manage tasks feature
- Update SuggetstArticle step
- Adds functional test for keeping tasks filter

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
Signed-off-by: Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
Signed-off-by: Gustavo Jaruga <darkshades@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Ábner Silva de Oliveira
     

04 Dec, 2015

1 commit

  • 0c7ed580   Organization Ratings plugin improvements ... Browse Dir » 
    - Adds hostspot in Organization Rating task details
- Improvements on task and organization ratings layout
- Added one hotspot for task contents and another for ratings container content
- Rejected rating comments are only displayed to env admins and comment owners
- All task messages now refers to "a Report" instead of Comment:
  i.g. "Report waiting for approval" instead of "Comment waiting for approval"
- Also added css style to auto expand task div

Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>
Signed-off-by: Dylan Guedes <djmgguedes@gmail.com>
Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>

See merge request !737
    Gabriel Silva
     

15 Jun, 2015

1 commit

12 Jun, 2015

1 commit

02 Jun, 2015

1 commit

01 Jun, 2015

1 commit

30 May, 2015

2 commits

28 May, 2015

1 commit

26 May, 2015

1 commit

12 May, 2015

1 commit

08 May, 2015

1 commit

27 Apr, 2015

2 commits

24 Apr, 2015

1 commit

24 Feb, 2015

1 commit

02 Feb, 2015

1 commit

20 Aug, 2014

2 commits

08 Aug, 2014

1 commit

14 May, 2014

1 commit

30 Jan, 2014

1 commit

27 Jan, 2014

2 commits

22 Jan, 2014

1 commit

09 Jan, 2014

1 commit

  • 6adc8bc2   Merge branch 'master' into rails3 ... Browse Dir » 
    Conflicts:
	app/controllers/my_profile/memberships_controller.rb
	app/helpers/application_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/category.rb
	app/models/change_password.rb
	app/models/comment.rb
	app/models/environment.rb
	app/models/event.rb
	app/models/profile.rb
	app/models/recent_documents_block.rb
	app/models/region.rb
	app/models/task.rb
	app/models/uploaded_file.rb
	app/views/account/forgot_password.html.erb
	app/views/events/_events_by_day.html.erb
	app/views/profile/_person_profile.html.erb
	app/views/shared/_manage_enterprises.html.erb
	config/environment.rb
	config/initializers/plugins.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	test/unit/article_test.rb
	test/unit/category_test.rb
	test/unit/change_password_test.rb
	test/unit/cms_helper_test.rb
	test/unit/comment_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/event_test.rb
	test/unit/folder_helper_test.rb
	test/unit/person_test.rb
	test/unit/price_detail_test.rb
	test/unit/profile_helper_test.rb
	test/unit/recent_documents_block_test.rb
	test/unit/scrap_test.rb
	test/unit/user_mailer_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb
	vendor/plugins/delayed_job/lib/delayed/worker.rb
	vendor/plugins/noosfero_caching/init.rb
    Rodrigo Souto
     

14 Oct, 2013

1 commit

19 Jul, 2013

1 commit

  • b05904aa   Merge branch 'master' into rails3 ... Browse Dir » 
    Conflicts:
	app/helpers/boxes_helper.rb
	app/models/comment.rb
	app/views/comment/_comment.rhtml
	app/views/comment/_comment_form.rhtml
	app/views/content_viewer/_comment.html.erb
	app/views/content_viewer/_comment.rhtml
	app/views/content_viewer/_comment_form.html.erb
	app/views/content_viewer/_comment_form.rhtml
	app/views/profile/send_mail.html.erb
	config/routes.rb
	debian/control
    Antonio Terceiro
     

12 Jul, 2013

1 commit