11 May, 2015
2 commits
08 May, 2015
7 commits
-
Conflicts: app/views/content_viewer/_article_toolbar.html.erb plugins/video/views/content_viewer/video_plugin/_video.html.erb
07 May, 2015
4 commits
06 May, 2015
2 commits
05 May, 2015
3 commits
30 Apr, 2015
5 commits
-
This reverts commit eff12aea9c2050f0acdcda89b10460582485be85.
-
This reverts commit fc17f5efebd8372ff4d18affb54ee0101c1c0daf.
29 Apr, 2015
3 commits
28 Apr, 2015
1 commit
-
This reverts commit 57521d2e91c796cc615f23a2df360bb8de518c34.
27 Apr, 2015
13 commits
-
Conflicts: test/unit/block_test.rb
-
Conflicts: app/models/suggest_article.rb
-
Refactoring SuggestArticle Refactoring SuggestArticle and add two new features: - Accept suggestion from logged in users; - SuggestArticle model accept other article types. See merge request !561
