08 Jan, 2016

1 commit


17 Nov, 2015

1 commit

  • 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
     

10 Nov, 2015

1 commit


08 Oct, 2015

2 commits


11 Sep, 2015

1 commit


27 Apr, 2015

1 commit


20 Apr, 2015

1 commit


17 Apr, 2015

1 commit


13 Apr, 2015

1 commit


08 Apr, 2015

1 commit


10 Mar, 2015

1 commit


05 Mar, 2015

1 commit


03 Mar, 2015

1 commit


27 Feb, 2015

1 commit


03 Feb, 2015

1 commit

  • Conflicts:
    	app/controllers/my_profile/profile_editor_controller.rb
    	app/helpers/search_helper.rb
    	app/models/invitation.rb
    	app/models/person.rb
    	app/views/cms/view.html.erb
    	app/views/templates/index.html.erb
    	plugins/community_track/views/content_viewer/_step_item.html.erb
    	test/functional/home_controller_test.rb
    	test/unit/person_test.rb
    	test/unit/profile_test.rb
    Rodrigo Souto
     

30 Oct, 2014

1 commit


01 Jul, 2014

1 commit


19 Mar, 2013

1 commit


30 Aug, 2012

1 commit


16 Mar, 2012

1 commit

  • Conflicts:
    	INSTALL
    	app/helpers/application_helper.rb
    	app/views/account/signup.rhtml
    	app/views/layouts/application-ng.rhtml
    	app/views/search/_product.rhtml
    	debian/control
    	debian/noosfero.install
    	debian/noosfero.links
    	features/step_definitions/noosfero_steps.rb
    	script/production
    Daniela Feitosa
     

14 Mar, 2012

1 commit


07 Mar, 2012

3 commits


05 Mar, 2012

2 commits


01 Mar, 2012

3 commits


19 Feb, 2012

1 commit


10 Jan, 2012

2 commits


22 Dec, 2011

1 commit


13 Oct, 2011

1 commit


16 Aug, 2011

1 commit


18 May, 2011

1 commit


04 Apr, 2011

1 commit


31 Jan, 2011

1 commit


15 Sep, 2010

1 commit