From 003b064ba39034d98b0c8255c025b9c72b09c4a6 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Tue, 12 Jan 2016 12:59:31 +0100
Subject: [PATCH] Update freature configuration
Markdown and learning progress features are no longer considered
experimental. Leaning progress can no longer be globally disabled.
---
.../thm/arsnova/controller/ConfigurationController.java | 1 -
src/main/resources/arsnova.properties.example | 9 +++++----
src/test/resources/arsnova.properties.example | 9 +++++----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index 1c6b86283..29323a84d 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -231,7 +231,6 @@ public class ConfigurationController extends AbstractController {
features.put("mathJax", "true".equals(mathJaxEnabled));
features.put("markdown", "true".equals(markdownEnabled));
- features.put("learningProgress", "true".equals(learningProgressEnabled));
features.put("studentsOwnQuestions", "true".equals(studentsOwnQuestions));
features.put("imageAnswer", "true".equals(imageAnswerEnabled));
features.put("flashcard", "true".equals(flashcardEnabled));
diff --git a/src/main/resources/arsnova.properties.example b/src/main/resources/arsnova.properties.example
index aa3732748..0ddea5c1f 100644
--- a/src/main/resources/arsnova.properties.example
+++ b/src/main/resources/arsnova.properties.example
@@ -172,12 +172,13 @@ connector.password=test
features.mathjax.enabled=true
features.mathjax.src=//cdn.mathjax.org/mathjax/2.4-latest/MathJax.js
+# Enable Markdown for text formatting, links and embedded media
+features.markdown.enabled=true
+
# The following features are considered experimental because they have not been
# tested in a production environment over a longer time frame and/or their
# behavior will change in future releases.
#
-features.markdown.enabled=true
-features.learning-progress.enabled=true
features.students-own-questions.enabled=true
features.freetext-imageanswer.enabled=true
features.question-format.flashcard.enabled=true
@@ -259,8 +260,8 @@ pp.licenses = CC by - Attribution,\
CC by-nc-nd Attribution-Non-Commercial- No Derivatives,\
GNU GPL - GNU General Public License
pp.logofilesize_b = 102400
-# Do not reorder levels. Append new levels to the end of the list. Otherwise, references in existing public sessions
-# could be mixed up.
+# Do not reorder levels. Append new levels to the end of the list. Otherwise,
+# references in existing public sessions could be mixed up.
#
pp.session-levels.de = Allgemeinbildung,\
Abitur,\
diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example
index aa3732748..0ddea5c1f 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -172,12 +172,13 @@ connector.password=test
features.mathjax.enabled=true
features.mathjax.src=//cdn.mathjax.org/mathjax/2.4-latest/MathJax.js
+# Enable Markdown for text formatting, links and embedded media
+features.markdown.enabled=true
+
# The following features are considered experimental because they have not been
# tested in a production environment over a longer time frame and/or their
# behavior will change in future releases.
#
-features.markdown.enabled=true
-features.learning-progress.enabled=true
features.students-own-questions.enabled=true
features.freetext-imageanswer.enabled=true
features.question-format.flashcard.enabled=true
@@ -259,8 +260,8 @@ pp.licenses = CC by - Attribution,\
CC by-nc-nd Attribution-Non-Commercial- No Derivatives,\
GNU GPL - GNU General Public License
pp.logofilesize_b = 102400
-# Do not reorder levels. Append new levels to the end of the list. Otherwise, references in existing public sessions
-# could be mixed up.
+# Do not reorder levels. Append new levels to the end of the list. Otherwise,
+# references in existing public sessions could be mixed up.
#
pp.session-levels.de = Allgemeinbildung,\
Abitur,\
--
GitLab