03 Oct, 2016

1 commit

26 Aug, 2016

2 commits

23 Aug, 2016

1 commit

01 Aug, 2016

1 commit

28 Jul, 2016

1 commit

11 Apr, 2016

1 commit

24 Mar, 2016

1 commit

09 Mar, 2016

1 commit

19 Feb, 2016

2 commits

05 Jan, 2016

2 commits

30 Dec, 2015

1 commit

22 Dec, 2015

2 commits

01 Dec, 2015

1 commit

17 Nov, 2015

1 commit

  • 92fbfd94   Merge branch 'master_rails4' into staging ... Browse File » 
    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
     

04 Nov, 2015

1 commit

27 Oct, 2015

1 commit

14 Oct, 2015

2 commits

30 Sep, 2015

1 commit

22 Sep, 2015

1 commit

02 Sep, 2015

1 commit

01 Sep, 2015

1 commit

17 Aug, 2015

1 commit

13 Aug, 2015

1 commit

10 Aug, 2015

1 commit

06 Aug, 2015

1 commit

29 Sep, 2014

1 commit

26 Sep, 2014

1 commit

22 Sep, 2014

1 commit

09 Sep, 2014

1 commit

01 Sep, 2014

1 commit

28 Aug, 2014

1 commit

21 Aug, 2014

1 commit

11 Aug, 2014

1 commit

08 Aug, 2014

1 commit

  • 3bc3acc2   Fix version of eventmachine ... Browse File » 
    The Debian package provided by the Noosfero repository reported 0.12.11
(which was never uploaded to rubygems.org), although it was actualy
0.12.10. A fixed packages was just made available.

This should fix stuff for people installing all the dependencies via
rubygems.
    Antonio Terceiro
     

04 Aug, 2014

1 commit