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
     

08 Oct, 2015

1 commit


30 Sep, 2015

1 commit


25 Sep, 2015

1 commit


22 Sep, 2015

1 commit


16 Sep, 2015

1 commit


27 Aug, 2015

1 commit


13 Aug, 2015

2 commits


10 Aug, 2015

1 commit


06 Aug, 2015

2 commits


31 Jul, 2015

1 commit


23 Jul, 2015

1 commit


22 Jul, 2015

2 commits


21 Jul, 2015

1 commit


19 Jun, 2015

1 commit


08 Jun, 2015

1 commit


02 Jun, 2015

1 commit


01 Jun, 2015

1 commit


06 Mar, 2015

2 commits


05 Mar, 2015

1 commit


02 Mar, 2015

1 commit


24 Feb, 2015

3 commits


23 Feb, 2015

1 commit


12 Feb, 2015

1 commit


04 Feb, 2015

1 commit


03 Feb, 2015

3 commits

  • Conflicts:
    	plugins/site_tour/lib/site_tour_plugin/tour_block.rb
    	plugins/site_tour/public/edit_tour_block.css
    	plugins/site_tour/public/main.js
    	plugins/site_tour/test/functional/site_tour_plugin_admin_controller_test.rb
    	plugins/site_tour/test/unit/site_tour_plugin_test.rb
    	plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb
    	plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block_group_item.html.erb
    	plugins/site_tour/views/tour_actions.html.erb
    Victor Costa
     
  • Victor Costa
     
  • 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


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
     

16 Jan, 2015

1 commit