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
     

07 Jan, 2014

1 commit


19 Dec, 2013

1 commit


16 Dec, 2013

1 commit


21 Nov, 2013

1 commit


16 Nov, 2013

1 commit


24 Oct, 2013

1 commit


14 Oct, 2013

1 commit


24 Sep, 2013

1 commit


18 Sep, 2013

1 commit


21 Aug, 2013

1 commit


05 Aug, 2013

1 commit


16 Jul, 2013

1 commit


08 Jul, 2013

1 commit


27 Jun, 2013

1 commit


06 Jun, 2013

1 commit


05 Jun, 2013

1 commit


30 May, 2013

1 commit


06 Mar, 2013

1 commit


04 Mar, 2013

1 commit


12 Jan, 2013

1 commit


04 Nov, 2012

1 commit


29 Oct, 2012

1 commit


28 Oct, 2012

1 commit


27 Oct, 2012

1 commit


24 Oct, 2012

1 commit


26 Aug, 2012

1 commit


23 Aug, 2012

1 commit


19 Aug, 2012

1 commit


18 Aug, 2012

1 commit


17 Aug, 2012

1 commit


09 Aug, 2012

1 commit

  •    * Licenses only can be removed with method 'post'
       * Fixing truncate calls to stop displaying deprecation warnings
       * Added buttons to add a new license and to go back to admin panel
       * Added new db/schema
    
    (ActionItem2379)
    Daniela Feitosa
     

08 Aug, 2012

1 commit


19 Jul, 2012

1 commit

  • Conflicts:
    	app/models/article.rb
    	app/models/profile.rb
    	app/models/uploaded_file.rb
    	public/javascripts/application.js
    	public/stylesheets/application.css
    	test/unit/article_test.rb
    	test/unit/category_finder_test.rb
    	test/unit/enterprise_test.rb
    Daniela Feitosa
     

18 Jul, 2012

1 commit


21 Jun, 2012

1 commit


19 May, 2012

1 commit


17 May, 2012

3 commits