29 Jan, 2015

1 commit


20 Jan, 2014

1 commit


09 Jan, 2014

1 commit

  • Conflicts:
    	app/controllers/my_profile/memberships_controller.rb
    	app/helpers/application_helper.rb
    	app/helpers/boxes_helper.rb
    	app/models/article.rb
    	app/models/category.rb
    	app/models/change_password.rb
    	app/models/comment.rb
    	app/models/environment.rb
    	app/models/event.rb
    	app/models/profile.rb
    	app/models/recent_documents_block.rb
    	app/models/region.rb
    	app/models/task.rb
    	app/models/uploaded_file.rb
    	app/views/account/forgot_password.html.erb
    	app/views/events/_events_by_day.html.erb
    	app/views/profile/_person_profile.html.erb
    	app/views/shared/_manage_enterprises.html.erb
    	config/environment.rb
    	config/initializers/plugins.rb
    	config/routes.rb
    	db/schema.rb
    	debian/control
    	lib/noosfero/plugin.rb
    	test/unit/article_test.rb
    	test/unit/category_test.rb
    	test/unit/change_password_test.rb
    	test/unit/cms_helper_test.rb
    	test/unit/comment_test.rb
    	test/unit/content_viewer_helper_test.rb
    	test/unit/event_test.rb
    	test/unit/folder_helper_test.rb
    	test/unit/person_test.rb
    	test/unit/price_detail_test.rb
    	test/unit/profile_helper_test.rb
    	test/unit/recent_documents_block_test.rb
    	test/unit/scrap_test.rb
    	test/unit/user_mailer_test.rb
    	vendor/plugins/action_tracker_has_comments/init.rb
    	vendor/plugins/delayed_job/lib/delayed/worker.rb
    	vendor/plugins/noosfero_caching/init.rb
    Rodrigo Souto
     

20 Nov, 2013

1 commit


19 Jul, 2013

1 commit

  • Conflicts:
    	app/helpers/boxes_helper.rb
    	app/models/comment.rb
    	app/views/comment/_comment.rhtml
    	app/views/comment/_comment_form.rhtml
    	app/views/content_viewer/_comment.html.erb
    	app/views/content_viewer/_comment.rhtml
    	app/views/content_viewer/_comment_form.html.erb
    	app/views/content_viewer/_comment_form.rhtml
    	app/views/profile/send_mail.html.erb
    	config/routes.rb
    	debian/control
    Antonio Terceiro
     

16 Jul, 2013

1 commit

  • Introducing bug (http://noosfero.org/Development/ActionItem2705)
    temporarily in order to avoid the performance issues associated with
    the necessary loading of all posts to run display_to?. When we develop a
    scoped way to retrieve this contents we then will be able to fix this
    bug.
    
    (ActionItem2706)
    Rodrigo Souto
     

25 Dec, 2012

1 commit


09 Feb, 2012

1 commit


25 Feb, 2011

1 commit


09 Dec, 2010

1 commit


05 Feb, 2010

1 commit


26 Oct, 2009

1 commit


02 Sep, 2009

1 commit


17 Jun, 2009

1 commit


23 Apr, 2009

1 commit


04 Apr, 2009

1 commit

  •   * Fixing BlogArchivesBlock to list the years in the correct order
      * Changing Article#recent to consider published_at instead of
        created_at for listing recent content.
      * small refactoring in FeedHandler (rename variable)
      * Better wording in blog edition template
    Antonio Terceiro
     

03 Apr, 2009

1 commit


28 Jan, 2009

1 commit


11 Dec, 2008

1 commit

  •   - display comment form opened
      - links to subscribe rss feed
      - show 'Edit blog' on view blog
      - display button to remove article when view
      - use select box instead of text fields to blog configuration
      - decreasing size of the field description
      - use 'New post' instead of 'New article'
    Joenio Costa
     

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