12 Jun, 2015

1 commit


14 Apr, 2015

1 commit


22 Jan, 2015

1 commit


18 Feb, 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
     

22 Jan, 2014

1 commit


21 Jan, 2014

1 commit



26 Sep, 2013

1 commit


17 Jul, 2013

1 commit


16 Jul, 2013

1 commit


12 Jul, 2013

1 commit


18 Mar, 2013

1 commit


15 Apr, 2012

1 commit


05 Apr, 2012

1 commit


24 Dec, 2011

1 commit


11 May, 2011

2 commits


27 Feb, 2011

1 commit


10 Dec, 2010

1 commit


09 Dec, 2010

1 commit


07 Dec, 2010

1 commit


21 Oct, 2010

1 commit

  •   * Posts unavailable for the user weren't displayed but were
        considered on pagination.
      * Used a direct sql to increase the performance.
      * Removing last and first_day_of_month methods and using the rails
        builtin methods in_the_beginning_of_month and in_the_end_of_month.
    
    P.S.: done against the master branch.
    
    (ActionItem1557)
    Rodrigo Souto
     

09 Aug, 2010

1 commit


06 Jul, 2010

1 commit


28 May, 2010

1 commit


14 May, 2010

1 commit

  • * Modularized RSS link in head code; added add_rss_feed_to_head helper
        method
    * Modularized RSS generation in FeedWriter class
      + Refactored RssFeed to use FeedWriter
      + removed feed_item_description (this fixes ActionItem1463)
    
    (ActionItem1518)
    Antonio Terceiro
     

26 Oct, 2009

1 commit


21 Jul, 2009

1 commit


28 May, 2009

1 commit


27 May, 2009

1 commit


20 May, 2009

1 commit


03 Apr, 2009

1 commit


16 Mar, 2009

1 commit


06 Jan, 2009

1 commit


15 Dec, 2008

1 commit


03 Dec, 2008

1 commit


29 Nov, 2008

1 commit

  •     block to list amount of posts by month
        offer BlogArchivesBlock only if profile has blog
        pagination
        save feed options after create blog
        the settings of feeds must be editable trhough it's parent blog
        not offer to create sub-folder to blog
        the title of the post and the comments count are links to the specific article
        display count of blog-post comments
        users cant create more then one blog
    Joenio Costa