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
     

10 Mar, 2016

2 commits

  • After creating the ArticleBlock view test at
    ff15413b2a8dca45d9f64e57270f294e351a0098 this test got broken.
    
    The root cause was the inclusion of ApplicationHelper for the
    article_block_test which led to `custom_options_article` for CMSHelper
    tests to fail as the BlogHelper (included by ApplicationHelper) was
    overriding the method.
    
    This has been fized by remove the include to ApplicationHelper and
    extract the necessary methods to separate helpers which led to two new
    methods for ArticleHelper and one new helper the ButtonsHelper.
    Rafael Reggiani Manzo
     
  • By removing the content method, it is now necessary to turn the test
    into a view one using the BoxesHelper method and properly stubbing other
    helpers.
    
    The view required fix at the html escaping method call synthax.
    Rafael Reggiani Manzo
     

23 Feb, 2016

1 commit

  • Also rewriting the file visualization to work consistently with every
    file type. Here is the overall basic behavior now:
    
      * If the request is passed with view=true, content is displayed
        as an article content.
        * If the file has an inline visualization (like images) it's already
          displayed.
        * If not, a download link is displayed.
      * If the request is passed with view=false, the file is provided
        straight, without any noosfero layout being loaded.
    
      * If the file is private:
        * And the user accesses its public filesystem path, apache (this is
          done by noosfero-apache) will redirect the request to rails
          path so that the rails server will provide it considering
          appropriate permissions.
        * And the user accesses its rails path, rails server will provide as
          well.
      * If the file is public:
        * And the user accesses its public filesystem path, apache will
          provide the file.
        * And the user accesses its rails path, rails server will redirect
          to its public filesystem path so that apache provides the file.
    Rodrigo Souto
     

10 Aug, 2015

1 commit


10 Feb, 2015

1 commit


26 Jan, 2015

1 commit


17 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
     

16 Sep, 2013

1 commit


01 Aug, 2013

1 commit


16 May, 2013

1 commit


22 Feb, 2011

1 commit


01 Feb, 2011

1 commit


07 Dec, 2010

1 commit


22 Jul, 2010

1 commit


17 Jul, 2010

1 commit


08 Jul, 2010

1 commit


06 Jul, 2010

1 commit


02 Jul, 2010

1 commit


17 May, 2010

1 commit


14 May, 2010

2 commits


30 Apr, 2010

1 commit


28 Apr, 2010

2 commits


09 Jul, 2008

1 commit


04 Jul, 2008

1 commit


28 Mar, 2008

1 commit


18 Jan, 2008

1 commit