06 Apr, 2016

1 commit

  • cc5fdb28   Add subtitle field to blocks ... Browse File » 
    Add subtitle support to the following core blocks:
* my_network
* profile_search
* categories
* highlights
* slideshow
* article
* blog_archives
* featured_products
* feed_reader
* link_list
* location
* products
* profile_list
* raw_html
* recent_documents
* tags

Add subtitle support to the following plugins blocks:
* community_track: track_list
* container_block: container
* context_content: context_content
* display_content: display_content_block
* event: event
* gallery_block: gallery_block
* organization_ratings: organization_ratings_block
* people_block: people_base
* profile_members_headlines: headlines
* recent_content: recent_content_block
* relevant_content: relevant_content_block
* site_tour: tour
* sniffer: interests_block

Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
    Arthur Esposte
     

10 Mar, 2016

1 commit

05 Feb, 2015

1 commit

11 Aug, 2014

1 commit

07 Aug, 2014

1 commit

  • 34f8f4d7   Merge remote-tracking branch 'origin/stable' ... Browse File » 
    Hopefully this is the very last time we do this.

Conflicts:
	Rakefile
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/content_viewer_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/product_categories_block.rb
	app/models/products_block.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/my_network.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/blocks/profile_info_actions/_community.html.erb
	app/views/blocks/profile_info_actions/_enterprise.html.erb
	app/views/blocks/profile_info_actions/_person.html.erb
	app/views/content_viewer/view_page.rhtml
	app/views/profile/index.rhtml
	app/views/shared/_disabled_enterprise.html.erb
	app/views/shared/articles_list.html.erb
	db/schema.rb
	debian/changelog
	lib/file_presenter.rb
	lib/noosfero.rb
	plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
	plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin_test.rb
	public/javascripts/application.js
	script/sample-articles
	script/sample-enterprises
	script/sample-products
	script/sample-profiles
	test/functional/cms_controller_test.rb
	test/functional/comment_controller_test.rb
	test/functional/content_viewer_controller_test.rb
	test/unit/application_helper_test.rb
	test/unit/article_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/folder_helper_test.rb
	test/unit/forum_helper_test.rb
    Antonio Terceiro
     

25 Dec, 2012

2 commits