18 Nov, 2015

1 commit

  • Custom fields can be added to any profile through the admin panel
    in the 'Fields' section. They have the same behaviour as the current
    Noosfero's fields (active, signup, required and privacy).
    
    Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
    Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
    Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
    Signed-off-by: Macartur de Sousa <macartur.sc@gmail.com>
    Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Marcos Pereira
     

11 Feb, 2015

1 commit


13 May, 2014

1 commit


11 Feb, 2014

1 commit

  • 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
     

25 Dec, 2012

1 commit