01 Aug, 2015

1 commit

24 Jul, 2015

1 commit

20 Jun, 2015

1 commit

16 Jun, 2015

1 commit

11 Feb, 2015

2 commits

30 Jan, 2015

1 commit

19 Dec, 2014

1 commit

07 Oct, 2014

1 commit

11 Sep, 2014

1 commit

07 Jul, 2014

2 commits

13 May, 2014

1 commit

  • 23914711   Merge branch 'master' into rails3 ... Browse Dir » 
    Conflicts:
	app/helpers/application_helper.rb
	app/helpers/layout_helper.rb
	app/models/community.rb
	app/models/enterprise.rb
	app/models/product_category.rb
	app/views/account/change_password.html.erb
	config/boot.rb
	config/environment.rb
	config/routes.rb
	lib/noosfero/plugin.rb
	test/unit/enterprise_activation_test.rb
	test/unit/person_notifier_test.rb
    Rodrigo Souto
     

27 Mar, 2014

1 commit

30 Jan, 2014

1 commit

28 Jan, 2014

1 commit

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
     

29 May, 2013

1 commit

01 Jan, 2013

1 commit

25 Dec, 2012

1 commit

18 Jul, 2012

2 commits

17 Jul, 2012

2 commits

11 Jul, 2012

1 commit

09 Jul, 2012

1 commit

06 Jul, 2012

1 commit

  • 2a1c3797   Fixes the hidden tag that overwrited product qualifiers ... Browse Dir » 
      An hidden tag is used to update qualifiers_list in products even when
  said qualifiers_list is empty, so it would behave accordingly with the
  way the qualifiers are added dinamically using javascript and ajax
  (that is, the list represents the content of a product's qualifiers,
  so an empty list means that whatever qualifiers that the product had
  before should be removed). But this tag was overwriting the qualifiers
  and certifiers added by the user, thus making rails believe that the
  qualifiers list was always empty.

  I've changed the hidden tag to have a default value 'nil' (which is
  actually a string, but it works; I couldn't find a way to put an
  actual nil value), and when the qualifiers list is updated the method
  inside the model ignores qualifiers whose id value are 'nil'.

(ActionItem2328)
    Larissa Reis
     

20 May, 2012

1 commit

10 May, 2012

1 commit

20 Mar, 2012

1 commit

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
     

15 Mar, 2012

1 commit

08 Mar, 2012

1 commit

10 Jan, 2012

3 commits

30 Dec, 2011

3 commits

10 Oct, 2011

1 commit

  • 619223c6   Bsc Plugin ... Browse Dir » 
    * Refactoring profile management to use tokeninput
  * Also, adding support of tokeninput to the core
* Adding attributes validated and cnpj to enterprise
* Environment option to define enterprise as validated by defaul
* Making profile namedscopes consider subclasses too
* Adapting enterprise icon and identification to meet Bsc expectations
* Adapting profile info actions to meet Bsc expectations
* Adapting control panel buttons to meet Bsc expectations
* Adapting core product to meed Bsc expectations
* Adding and fixing plugin hotspots

(ActionItem2085, ActionItem2087, ActionItem2086, ActionItem2088)
    Rodrigo Souto