29 Sep, 2016

1 commit


17 Jul, 2016

1 commit

  • Signed-off-by: Alessandro Caetano <alessandro.caetanob@gmail.com>
    Signed-off-by: Artur Bersan de Faria <arturbersan@gmail.com>
    Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Signed-off-by: Matheus Miranda <matheusmirandalacerda@gmail.com>
    Signed-off-by: Sabryna Sousa <sabryna.sousa1323@gmail.com>
    Signed-off-by: Victor Matias Navarro <victor.matias.navarro@gmail.com>
    Signed-off-by: Vitor Barbosa <vitormga15@gmail.com>
    Marcos Pereira
     

16 Jul, 2016

1 commit


06 Jun, 2016

1 commit


18 May, 2016

1 commit


12 May, 2016

1 commit


11 May, 2016

1 commit


22 Apr, 2016

1 commit


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
     

22 Feb, 2016

1 commit


18 Feb, 2016

1 commit


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

24 Jul, 2015

1 commit


02 Jun, 2015

1 commit


28 May, 2015

1 commit


12 May, 2015

1 commit


07 May, 2015

1 commit


27 Apr, 2015

1 commit


24 Apr, 2015

1 commit


23 Mar, 2015

1 commit


10 Mar, 2015

1 commit


28 Jan, 2015

1 commit

  • Conflicts:
    	app/helpers/article_helper.rb
    	app/helpers/boxes_helper.rb
    	app/models/article.rb
    	app/models/block.rb
    	app/views/content_viewer/view_page.html.erb
    	db/schema.rb
    	plugins/community_track/views/blocks/_track_list_more.html.erb
    	plugins/community_track/views/box_organizer/community_track_plugin/_track_list_block.html.erb
    	public/javascripts/article.js
    	test/unit/block_test.rb
    	test/unit/person_notifier_helper_test.rb
    Victor Costa
     

27 Jan, 2015

1 commit


26 Jan, 2015

1 commit


21 Jan, 2015

1 commit

  • Fixed blocks can't be modified by regular users, but only by
    administrators. The main use case is defining a few blocks in the user
    or community templates, so that users and communities can't remove or
    change them.
    
    Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
    Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
    Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
    Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
    Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
    Fabio Teixeira
     

15 Jan, 2015

1 commit

  • Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
    Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
    Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
    Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
    Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
    Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
    Arthur Esposte
     

18 Dec, 2014

2 commits


16 Dec, 2014

3 commits


03 Dec, 2014

1 commit


10 Oct, 2014

1 commit


30 Sep, 2014

2 commits


23 Sep, 2014

1 commit