17 Jul, 2016

1 commit


15 Jun, 2016

1 commit


26 Apr, 2016

1 commit


08 Apr, 2016

1 commit


06 Apr, 2016

2 commits

  • Braulio Bhavamitra
     
  • 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
     

29 Mar, 2016

1 commit


23 Mar, 2016

2 commits

  • This method was producing view code from within the model which is a
    violation of MVC.
    
    Part of the code was extracted into the new helper and most of it became
    a view. This follow the standard for using
    BoxesHelper#render_block_footer.
    Rafael Reggiani Manzo
     
  • This method was producing view code from within the model which is a
    violation of MVC.
    
    Part of the code was extracted into the new helper and most of it became
    a view. This follow the standard for using
    BoxesHelper#render_block_content.
    Rafael Reggiani Manzo
     

22 Feb, 2016

2 commits


17 Feb, 2016

1 commit


03 Nov, 2015

1 commit


30 Oct, 2015

1 commit


02 Oct, 2015

1 commit


25 Sep, 2015

1 commit


16 Sep, 2015

1 commit


11 Sep, 2015

3 commits


05 Sep, 2015

1 commit

  •   - Order members by name
      - Removed white spaces
      - Changed strings to be translated
      - Renamed div id and test
      - Adjust ul tag members
      - Fixed plugin dependency
    
    Signed-off-by: Omar Junior <omarroinuj@gmail.com>
    Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
    Signed-off-by: Vitor Barbosa <vitormga15@gmail.com>
    Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com>
    Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
    Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
    Omar Junior
     

13 Aug, 2015

1 commit


10 Aug, 2015

1 commit


06 Aug, 2015

2 commits


31 Jul, 2015

1 commit


24 Jul, 2015

3 commits


13 Jul, 2015

1 commit


07 Jul, 2015

1 commit


01 Jun, 2015

1 commit


12 Mar, 2015

1 commit


05 Mar, 2015

1 commit


03 Mar, 2015

1 commit


03 Feb, 2015

1 commit

  • Conflicts:
    	app/controllers/my_profile/profile_editor_controller.rb
    	app/helpers/search_helper.rb
    	app/models/invitation.rb
    	app/models/person.rb
    	app/views/cms/view.html.erb
    	app/views/templates/index.html.erb
    	plugins/community_track/views/content_viewer/_step_item.html.erb
    	test/functional/home_controller_test.rb
    	test/unit/person_test.rb
    	test/unit/profile_test.rb
    Rodrigo Souto
     

02 Feb, 2015

1 commit


16 Jan, 2015

1 commit

  •   `instance_eval` in FriendsBlockTest chokes on `user` so we avoid this
      `people_block` test from crashing by checking if suggestions exist
      first. Therefore this unit test is only testing for a view all link,
      so I wrote a couple more tests to test the added suggestion feature
      inside the block.
    
      I wasn't sure where to put a test to actually test that the
      suggestions are being rendered so I created a ProfileControllerTest,
      but I'm open to suggestions on where it would be best :)
    Larissa Reis
     

15 Jan, 2015

2 commits