03 Jul, 2015

1 commit


01 Jul, 2015

2 commits


29 Jun, 2015

4 commits


25 Jun, 2015

1 commit


17 Jun, 2015

1 commit


16 Jun, 2015

1 commit


05 Jun, 2015

2 commits


02 Jun, 2015

1 commit


31 May, 2015

1 commit


30 May, 2015

1 commit


27 May, 2015

1 commit


26 May, 2015

5 commits


20 Feb, 2015

1 commit


30 Jan, 2015

1 commit


29 Jan, 2015

1 commit


28 Jan, 2015

1 commit


24 Jan, 2015

1 commit


10 Nov, 2014

2 commits


20 Aug, 2014

2 commits


09 Jan, 2014

1 commit

  • Conflicts:
    	app/controllers/my_profile/memberships_controller.rb
    	app/helpers/application_helper.rb
    	app/helpers/boxes_helper.rb
    	app/models/article.rb
    	app/models/category.rb
    	app/models/change_password.rb
    	app/models/comment.rb
    	app/models/environment.rb
    	app/models/event.rb
    	app/models/profile.rb
    	app/models/recent_documents_block.rb
    	app/models/region.rb
    	app/models/task.rb
    	app/models/uploaded_file.rb
    	app/views/account/forgot_password.html.erb
    	app/views/events/_events_by_day.html.erb
    	app/views/profile/_person_profile.html.erb
    	app/views/shared/_manage_enterprises.html.erb
    	config/environment.rb
    	config/initializers/plugins.rb
    	config/routes.rb
    	db/schema.rb
    	debian/control
    	lib/noosfero/plugin.rb
    	test/unit/article_test.rb
    	test/unit/category_test.rb
    	test/unit/change_password_test.rb
    	test/unit/cms_helper_test.rb
    	test/unit/comment_test.rb
    	test/unit/content_viewer_helper_test.rb
    	test/unit/event_test.rb
    	test/unit/folder_helper_test.rb
    	test/unit/person_test.rb
    	test/unit/price_detail_test.rb
    	test/unit/profile_helper_test.rb
    	test/unit/recent_documents_block_test.rb
    	test/unit/scrap_test.rb
    	test/unit/user_mailer_test.rb
    	vendor/plugins/action_tracker_has_comments/init.rb
    	vendor/plugins/delayed_job/lib/delayed/worker.rb
    	vendor/plugins/noosfero_caching/init.rb
    Rodrigo Souto
     

24 Oct, 2013

1 commit


16 Oct, 2013

1 commit


14 Oct, 2013

1 commit


06 Sep, 2013

1 commit


26 Jul, 2013

1 commit


23 Jul, 2013

1 commit


19 Jul, 2013

1 commit

  • Conflicts:
    	app/helpers/boxes_helper.rb
    	app/models/comment.rb
    	app/views/comment/_comment.rhtml
    	app/views/comment/_comment_form.rhtml
    	app/views/content_viewer/_comment.html.erb
    	app/views/content_viewer/_comment.rhtml
    	app/views/content_viewer/_comment_form.html.erb
    	app/views/content_viewer/_comment_form.rhtml
    	app/views/profile/send_mail.html.erb
    	config/routes.rb
    	debian/control
    Antonio Terceiro
     

20 Feb, 2013

1 commit


25 Dec, 2012

1 commit