07 Dec, 2015

3 commits

30 Nov, 2015

1 commit

19 Nov, 2015

1 commit

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

1 commit

29 Oct, 2015

1 commit

13 Oct, 2015

1 commit

07 Oct, 2015

1 commit

06 Oct, 2015

1 commit

02 Oct, 2015

2 commits

30 Sep, 2015

1 commit

26 Sep, 2015

1 commit

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
     

11 Sep, 2015

1 commit

04 Sep, 2015

1 commit

02 Sep, 2015

1 commit

  • 04576c7e   Fix clone article behavior ... Browse Dir » 
    Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Omar Júnior <omarroinuj@gmail.com>
Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: Vítor Barbosa <vitornga15@gmail.com>
    Vitor Barbosa de Araujo
     

28 Aug, 2015

1 commit

21 Aug, 2015

1 commit

13 Aug, 2015

2 commits

12 Aug, 2015

1 commit

09 Aug, 2015

1 commit

01 Aug, 2015

1 commit

25 Jul, 2015

1 commit

24 Jul, 2015

2 commits

23 Jul, 2015

2 commits

22 Jul, 2015

1 commit

17 Jun, 2015

4 commits

16 Jun, 2015

2 commits