Merge branch 'master' into rc/2.5.0

# Conflicts: # Source/edX-Info.plist
openedx-unsupported · Jun 13, 2016 · a010986 · a010986
2 parents 36603be + 800054c
commit a010986
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/Source/CourseOutline.swift b/Source/CourseOutline.swift
@@ -86,7 +86,7 @@ public struct CourseOutline {
                         // Inline discussion is in progress feature. Will remove this code when it's ready to ship
                         type = .Unknown(typeName)
 
-                        if OEXConfig.sharedConfig().inlineDiscussionsEnabled {
+                        if OEXConfig.sharedConfig().discussionsEnabled {
                             let bodyData = body[Fields.StudentViewData].object as? NSDictionary
                             let discussionModel = DiscussionModel(dictionary: bodyData ?? [:])
                             type = .Discussion(discussionModel)

diff --git a/Source/OEXConfig+AppFeatures.swift b/Source/OEXConfig+AppFeatures.swift
@@ -32,9 +32,4 @@ extension OEXConfig {
     var badgesEnabled : Bool {
         return boolForKey("BADGES_ENABLED")
     }
-
-    var inlineDiscussionsEnabled : Bool {
-        return boolForKey("INLINE_DISCUSSIONS")
-    }
-
 }
diff --git a/Source/edX-Info.plist b/Source/edX-Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.5.1</string>
+	<string>2.5.2</string>
 	<key>FacebookDisplayName</key>
 	<string>edX</string>
 	<key>ITSAppUsesNonExemptEncryption</key>