03 Oct, 2016

1 commit

06 Sep, 2016

1 commit

02 Sep, 2016

1 commit

11 Aug, 2016

1 commit

04 Aug, 2016

1 commit

05 Jul, 2016

2 commits

17 May, 2016

1 commit

16 May, 2016

1 commit

04 May, 2016

2 commits

26 Apr, 2016

2 commits

25 Apr, 2016

1 commit

  • 13e6bd4a   Merge branch 'master' into staging ... Browse Dir » 
    Conflicts:
	.travis.yml
	app/controllers/my_profile/tasks_controller.rb
	app/helpers/application_helper.rb
	app/views/profile_editor/_pending_tasks.html.erb
	app/views/tasks/processed.html.erb
	test/functional/tasks_controller_test.rb
    Victor Costa
     

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
     

11 Apr, 2016

1 commit

08 Apr, 2016

1 commit

24 Mar, 2016

1 commit

10 Mar, 2016

1 commit

25 Jan, 2016

1 commit

22 Jan, 2016

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
     

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
     

02 Oct, 2015

1 commit

30 Sep, 2015

1 commit

26 Sep, 2015

3 commits

24 Sep, 2015

1 commit

  • ef41c154   Allow user to remove article or profile image ... Browse Dir »
    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
     

13 Aug, 2015

2 commits

10 Aug, 2015

1 commit

06 Aug, 2015

1 commit

01 Aug, 2015

1 commit

25 Jul, 2015

1 commit

24 Jul, 2015

2 commits

03 Jul, 2015

1 commit

18 Jun, 2015

1 commit

17 Jun, 2015

1 commit

  • 5ee24034   Refactoring article content visualization ... Browse Dir » 
      - 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