05 Jan, 2016

1 commit

28 Dec, 2015

1 commit

18 Dec, 2015

1 commit

15 Dec, 2015

1 commit

14 Dec, 2015

1 commit

10 Dec, 2015

2 commits

09 Dec, 2015

1 commit

08 Dec, 2015

1 commit

07 Dec, 2015

3 commits

04 Dec, 2015

2 commits

  • 2dd9c858   Merge branch 'master' into staging_rails4 Browse Dir »
    Victor Costa
     
  • 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
     

30 Nov, 2015

1 commit

23 Nov, 2015

1 commit

  • 95fdfbab   Add custom field feature to core ... Browse Dir » 
    Custom fields can be added to any profile through the admin panel
in the 'Fields' section. They have the same behaviour as the current
Noosfero's fields (active, signup, required and privacy).

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
Signed-off-by: Macartur de Sousa <macartur.sc@gmail.com>
Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Marcos Pereira
     

19 Nov, 2015

2 commits

17 Nov, 2015

1 commit

  • 92fbfd94   Merge branch 'master_rails4' into staging ... Browse Dir » 
    Conflicts:
	Gemfile
	Rakefile
	app/controllers/box_organizer_controller.rb
	app/controllers/my_profile/tasks_controller.rb
	app/controllers/public/profile_controller.rb
	app/mailers/user_mailer.rb
	app/models/article.rb
	app/models/person.rb
	app/models/product_category.rb
	app/models/task.rb
	config/application.rb
	config/routes.rb
	lib/acts_as_having_settings.rb
	lib/noosfero/api/entities.rb
	lib/noosfero/api/helpers.rb
	lib/noosfero/api/session.rb
	lib/noosfero/api/v1/articles.rb
	lib/noosfero/api/v1/contacts.rb
	lib/noosfero/api/v1/search.rb
	lib/noosfero/api/v1/users.rb
	test/functional/tasks_controller_test.rb
	test/unit/api/articles_test.rb
	test/unit/api/helpers_test.rb
	test/unit/api/people_test.rb
	test/unit/api/search_test.rb
	test/unit/api/session_test.rb
	test/unit/api/users_test.rb
	test/unit/person_notifier_test.rb
	test/unit/task_test.rb
	vendor/plugins/access_control/lib/acts_as_accessible.rb
    Victor Costa
     

16 Nov, 2015

1 commit

12 Nov, 2015

1 commit

03 Nov, 2015

4 commits

29 Oct, 2015

1 commit

28 Oct, 2015

2 commits

13 Oct, 2015

1 commit

07 Oct, 2015

1 commit

06 Oct, 2015

2 commits

05 Oct, 2015

1 commit

03 Oct, 2015

1 commit

02 Oct, 2015

3 commits

30 Sep, 2015

1 commit

29 Sep, 2015

1 commit

28 Sep, 2015

1 commit