08 Apr, 2016

1 commit


07 Apr, 2016

1 commit

  • fixes community track plugin
    
    Signed-off-by: Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br>
    Signed-off-by: Gustavo Jaruga <darkshades@gmail.com>
    Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Signed-off-by: Victor Costa <vfcosta@gmail.com>
    
    See merge request !816
    Daniela Feitosa
     

06 Apr, 2016

2 commits

  • 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
     
  • - Remove html from community_track models
    - Extracts update_categories to categories helper
    Marcos Pereira
     

05 Apr, 2016

1 commit

  • Signed-off-by: Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br>
    Signed-off-by: Gustavo Jaruga <darkshades@gmail.com>
    Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Signed-off-by: Victor Costa <vfcosta@gmail.com>
    Marcos Pereira
     

18 Mar, 2016

1 commit


21 Jan, 2016

1 commit


20 Jan, 2016

1 commit


12 Nov, 2015

1 commit


03 Nov, 2015

2 commits


30 Oct, 2015

1 commit


13 Oct, 2015

1 commit

  • Signed-off-by: Victor Costa <vfcosta@gmail.com>
    Signed-off-by: Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
    
    Conflicts:
    	app/controllers/my_profile/profile_design_controller.rb
    	app/helpers/boxes_helper.rb
    	app/helpers/layout_helper.rb
    	app/views/layouts/_javascript.html.erb
    	public/stylesheets/application.css
    	test/functional/environment_design_controller_test.rb
    	test/functional/profile_design_controller_test.rb
    Victor Costa
     

02 Oct, 2015

1 commit


25 Sep, 2015

1 commit


16 Sep, 2015

1 commit


28 Aug, 2015

1 commit


13 Aug, 2015

2 commits


10 Aug, 2015

1 commit


06 Aug, 2015

2 commits


31 Jul, 2015

1 commit


24 Jul, 2015

4 commits


21 Jul, 2015

1 commit


01 Jun, 2015

1 commit


06 Mar, 2015

1 commit


05 Mar, 2015

1 commit


24 Feb, 2015

2 commits


23 Feb, 2015

1 commit


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


15 Jan, 2015

2 commits