18 May, 2016
12 commits
-
Do not list boxes and blocks for users without permission in boxes endpoint See merge request !925
17 May, 2016
13 commits
-
admin_notifications: checkbox message for profile Changes "homepage" checkbox message when the notification is for a profile. See merge request !923
-
fix translation marks Moved translations from constant to method, otherwise they wont be translated. Also, fix translation marks missing for a string. See merge request !924
-
Refactor RelevantContentBlock#content into views Removes the html generation coupled into the class taking advantage of BoxesHelper structure. See merge request !922
-
Removes the html generation coupled into the class taking advantage of BoxesHelper structure
-
Conflicts: plugins/comment_paragraph/lib/comment_paragraph_plugin/discussion_block.rb plugins/comment_paragraph/views/blocks/discussion.html.erb plugins/comment_paragraph/views/box_organizer/comment_paragraph_plugin/_discussion_block.html.erb
-
comment_paragraph: new block that display discussions See merge request !919
-
Conflicts: app/views/shared/not_found.html.erb
16 May, 2016
15 commits
-
this fixes test broken by the commit db91ca
-
(cherry picked from commit 18589b83f421fd4b3f6680125e336b1e4cd64dc5)
-
(cherry picked from commit 06d7abf4db251643c6a1bf644dc667190c65320a)
-
Fixes ActiveRecord relations for descendants Temporary fix, waiting for original fix to be merged. Original author: Jon Moss Merge Request: https://github.com/rails/rails/pull/24719 Issue: https://github.com/rails/rails/issues/20678 See merge request !914
-
Improvements to tags API * Get environment tags * Require authentication only to post article tags * Tests for the whole tags API See merge request !918
