27 Jan, 2014

1 commit

24 Jan, 2014

1 commit

21 Jan, 2014

2 commits

09 Jan, 2014

1 commit

  • 6adc8bc2   Merge branch 'master' into rails3 ... Browse Dir » 
    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
     

16 Dec, 2013

1 commit

24 Oct, 2013

1 commit

01 Oct, 2013

1 commit

24 Sep, 2013

2 commits

27 Dec, 2012

1 commit

25 Dec, 2012

2 commits

23 Dec, 2012

1 commit

30 Nov, 2012

1 commit

06 Nov, 2012

2 commits

11 Sep, 2012

1 commit

05 Sep, 2012

1 commit

31 Aug, 2012

1 commit

24 Aug, 2012

2 commits

23 Aug, 2012

1 commit

21 Aug, 2012

1 commit

19 Jul, 2012

1 commit

  • 75524307   Merging AI1826 with master ... Browse Dir » 
    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
     

05 Jul, 2012

1 commit

  • 06c13aae   Modularizing the hotspot feature ... Browse Dir » 
      * Every class now can declare that it is able to inlcude hotspots by
    declaring 'acts_as_having_hotspots'. It's important to note that
    every class that have hotspots must define an instance method named
    'environment' that returns the environment associated with the
    instance.

  * Now the enabled_plugins method is centralized in the Thread.current
    making the plugins instantiation happen only once by Thread. Every
    request reinstantiate the plugins since every request creates a new
    Thread. The models that access this method only instantiate it if it
    wasn't instantiated already.

  * Since the models doesn't reinstantiate the plugins in the same
    Thread and the tests run in only one Thread, the tests that have
    some plugin stuff must clean the instantiation in the teardown.
    Rodrigo Souto
     

21 May, 2012

2 commits

17 May, 2012

4 commits

16 Mar, 2012

1 commit

  • 3fbcccd5   Merge branch 'master' into solr_with_0.36.1 ... Browse Dir » 
    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
     

09 Mar, 2012

1 commit

03 Mar, 2012

2 commits

19 Feb, 2012

1 commit

  • 50def845   Merge remote branch 'noosfero-bsc/new-search-merge' ... Browse Dir » 
    Conflicts:
	app/controllers/application.rb
	app/controllers/public/browse_controller.rb
	app/helpers/application_helper.rb
	app/helpers/display_helper.rb
	app/models/environment_finder.rb
	app/models/product.rb
	app/views/layouts/_javascript.rhtml
	app/views/layouts/application-ng.rhtml
	public/javascripts/application.js
	public/stylesheets/application.css
	test/functional/browse_controller_test.rb
	test/functional/search_controller_test.rb
	vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
    Rafael Martins
     

22 Dec, 2011

1 commit

27 Nov, 2011

1 commit

  • d35779c0   Merge branch 'master' into rails-2.3.5 ... Browse Dir » 
    Conflicts:
	app/controllers/admin_controller.rb
	app/controllers/application.rb
	app/controllers/public/account_controller.rb
	app/controllers/public/content_viewer_controller.rb
	lib/noosfero/i18n.rb
	test/functional/account_controller_test.rb
	test/functional/admin_controller_test.rb
	test/unit/contact_test.rb
	test/unit/profile_test.rb
    Antonio Terceiro
     

10 Oct, 2011

1 commit