11 Feb, 2014

1 commit

  • e9fea38f   Merge branch 'master' into rails3-merge ... Browse File » 
    Conflicts:
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/article_helper.rb
	app/helpers/catalog_helper.rb
	app/helpers/comment_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/members_block.rb
	app/models/person.rb
	app/models/profile.rb
	app/views/blocks/profile_info.html.erb
	app/views/blocks/profile_info_actions/community.html.erb
	config/initializers/dependencies.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	lib/tasks/plugins.rake
	plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
	script/sample-products
	test/functional/catalog_controller_test.rb
	test/functional/manage_products_controller_test.rb
	test/functional/map_balloon_controller_test.rb
	test/functional/profile_controller_test.rb
	test/functional/search_controller_test.rb
	test/unit/box_test.rb
	test/unit/cms_helper_test.rb
	test/unit/enterprise_test.rb
	test/unit/environment_test.rb
	test/unit/featured_products_block_test.rb
	test/unit/person_test.rb
	test/unit/product_category_test.rb
	test/unit/product_test.rb
	test/unit/profile_test.rb
	test/unit/user_test.rb
	vendor/plugins/monkey_patches/methods_from_fake_arel/init.rb
    Rodrigo Souto
     

29 Jan, 2014

1 commit

28 Jan, 2014

1 commit

23 Jan, 2014

1 commit

22 Jan, 2014

1 commit

20 Jan, 2014

1 commit

14 Nov, 2013

1 commit

08 Nov, 2013

1 commit

21 Oct, 2013

1 commit

20 Aug, 2013

1 commit

11 Jul, 2013

1 commit

12 Apr, 2013

1 commit

11 Apr, 2013

1 commit

30 Jan, 2013

1 commit

26 Jan, 2013

2 commits

22 Jan, 2013

1 commit

22 Oct, 2012

1 commit

21 Oct, 2012

1 commit

13 Aug, 2012

1 commit

25 May, 2012

1 commit

24 May, 2012

1 commit

16 May, 2012

1 commit

22 Mar, 2012

1 commit

27 Jan, 2012

1 commit

24 Jan, 2012

1 commit

16 Jan, 2012

2 commits

08 Dec, 2011

1 commit

27 Nov, 2011

1 commit

  • d35779c0   Merge branch 'master' into rails-2.3.5 ... Browse File » 
    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
     

22 Nov, 2011

1 commit

14 Nov, 2011

1 commit

10 Oct, 2011

2 commits

  • 619223c6   Bsc Plugin ... Browse File » 
    * 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
     
  • 4fe87ea2   Adding recaptcha to comments and article suggestion ... Browse File » 
    (ActionItem2075)
    Caio SBA
     

07 Oct, 2011

1 commit

30 Sep, 2011

2 commits

04 Aug, 2011

1 commit

23 Feb, 2011

1 commit

22 Feb, 2011

1 commit