16 Jan, 2014
1 commit
-
Conflicts: HACKING
15 Jan, 2014
2 commits
-
Conflicts: test/functional/cms_controller_test.rb test/unit/profile_test.rb
-
Conflicts: plugins/display_content/lib/display_content_block.rb plugins/display_content/test/unit/display_content_block_test.rb
13 Jan, 2014
2 commits
07 Jan, 2014
1 commit
-
Conflicts: db/schema.rb test/unit/person_test.rb
03 Jan, 2014
2 commits
18 Dec, 2013
6 commits
-
Conflicts: plugins/display_content/lib/display_content_block.rb
-
… into order-attributes
-
Conflicts: test/unit/profile_test.rb
17 Dec, 2013
11 commits
-
Fix problem when calling content types plugin hotspot outside of a profile. This is needed by community track plugin to display available content types for selection at step edition.
16 Dec, 2013
11 commits
-
Conflicts: test/unit/article_test.rb
-
…into merge-requests/407
13 Dec, 2013
4 commits