26 Aug, 2015

1 commit


31 Jul, 2015

1 commit


12 May, 2015

1 commit


27 Apr, 2015

1 commit


13 Apr, 2015

1 commit


10 Apr, 2015

2 commits


08 Apr, 2015

1 commit


06 Apr, 2015

1 commit


27 Mar, 2015

1 commit


26 Mar, 2015

2 commits


10 Mar, 2015

1 commit


26 Feb, 2015

1 commit


25 Feb, 2015

1 commit


24 Feb, 2015

1 commit


22 Feb, 2015

1 commit


13 Feb, 2015

1 commit


10 Feb, 2015

1 commit


06 Feb, 2015

1 commit


04 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
     

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

2 commits


22 Jan, 2015

1 commit


21 Jan, 2015

1 commit


14 Jan, 2015

1 commit


08 Jan, 2015

2 commits


19 Dec, 2014

2 commits


16 Dec, 2014

3 commits


03 Dec, 2014

2 commits


24 Nov, 2014

2 commits


05 Nov, 2014

1 commit