17 May, 2016

1 commit


05 May, 2016

1 commit


18 Apr, 2016

1 commit

  • Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
    Signed-off-by: Arthur Jahn <stutrzbecher@gmail.com>
    Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Signed-off-by: Victor Costa <vfcosta@gmail.com>
    Carlos Purificação
     

06 Apr, 2016

1 commit

  • 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
     

01 Aug, 2015

1 commit


24 Jul, 2015

1 commit


03 Feb, 2015

1 commit


25 Jul, 2014

1 commit


12 May, 2014

1 commit


29 Apr, 2014

1 commit

  • Some specific points:
    
    - ./script/quick-start not works from start to end on a clean Debian
      wheezy system
    - Gemfile: remove checking for programs since the Gemfile is not really
      the right place to do this
    - Gemfile.lock: lock gem versions against Debian wheezy.  This assumes
      package versions in Debian wheezy + some backported packages available
      at http://people.debian.org/~terceiro/noosfero-wheezy-backports/
    - db:data:minimal: add an explicit contact email to the new environment.
      This fixes a long standing issue: when installing Noosfero on a brand
      new system, exim MTA will choke on a malformed sender address, and
      abort the entire installation.
    - added a simple Vagrantfile for development purposes
    
    Pending:
    
    - provide proper backports for packages and drop the temporary
      http://people.debian.org/~terceiro/noosfero-wheezy-backports/
    Antonio Terceiro
     

25 Mar, 2014

2 commits


24 Mar, 2014

3 commits


11 Mar, 2014

1 commit


07 Mar, 2014

4 commits


26 Feb, 2014

2 commits


25 Feb, 2014

2 commits


24 Feb, 2014

1 commit


20 Feb, 2014

1 commit


13 Feb, 2014

6 commits


11 Feb, 2014

4 commits

  • Braulio Bhavamitra
     
  • Conflicts:
    	app/views/profile_themes/add_css.rhtml
    	app/views/profile_themes/add_image.rhtml
    	app/views/profile_themes/css_editor.rhtml
    	app/views/profile_themes/edit.rhtml
    	app/views/profile_themes/new.rhtml
    	app/views/themes/add_css.html.erb
    	app/views/themes/add_css.rhtml
    	app/views/themes/add_image.html.erb
    	app/views/themes/add_image.rhtml
    	app/views/themes/css_editor.html.erb
    	app/views/themes/css_editor.rhtml
    	app/views/themes/edit.html.erb
    	app/views/themes/edit.rhtml
    	app/views/themes/index.html.erb
    	app/views/themes/new.html.erb
    	app/views/themes/new.rhtml
    	test/factories.rb
    	test/functional/profile_themes_controller_test.rb
    Rodrigo Souto
     
  • 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
     
  • Victor Costa
     

10 Feb, 2014

2 commits


06 Feb, 2014

1 commit


29 Jan, 2014

1 commit