07 May, 2015
2 commits
23 Mar, 2015
1 commit
06 Mar, 2015
1 commit
05 Mar, 2015
1 commit
04 Feb, 2015
1 commit
-
Conflicts: app/controllers/public/search_controller.rb app/models/profile.rb app/views/cms/edit.html.erb public/stylesheets/application.css
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
15 Jan, 2015
2 commits
17 Dec, 2014
7 commits
21 Nov, 2014
8 commits
20 Nov, 2014
1 commit
18 Nov, 2014
1 commit
11 Nov, 2014
1 commit
07 Nov, 2014
1 commit
06 Nov, 2014
2 commits
05 Nov, 2014
3 commits
-
This reverts commit d73b4991c58e2424732fe6981f5895ee6e3bde8a.
29 Oct, 2014
1 commit
20 Oct, 2014
1 commit
07 Oct, 2014
1 commit
02 Oct, 2014
1 commit
01 Oct, 2014
1 commit
17 Jun, 2014
1 commit
-
Conflicts: plugins/display_content/test/unit/display_content_block_test.rb