Merge remote-tracking branch 'origin/master'

src/main/java/de/thm/arsnova/controller/ConfigurationController.java

@@ -79,6 +79,9 @@ public class ConfigurationController extends AbstractController {
 	@Value("${features.mathjax.enabled:true}")
 	private String mathJaxEnabled;
 
+	@Value("${features.mathjax.src:}")
+	private String mathJaxSrc;
+
 	@Value("${features.markdown.enabled:false}")
 	private String markdownEnabled;
 
@@ -195,6 +198,9 @@ public class ConfigurationController extends AbstractController {
 		if (!"".equals(maxUploadFilesize)) {
 			config.put("maxUploadFilesize", maxUploadFilesize);
 		}
+		if (!"".equals(mathJaxSrc) && "true".equals(mathJaxEnabled)) {
+			config.put("mathJaxSrc", mathJaxSrc);
+		}
 
 		config.put("answerOptionLimit", Integer.valueOf(answerOptionLimit));
 		config.put("parseAnswerOptionFormatting", Boolean.valueOf(parseAnswerOptionFormatting));
@@ -209,7 +215,7 @@ public class ConfigurationController extends AbstractController {
 		features.put("gridSquare", "true".equals(gridSquareEnabled));
 		features.put("sessionImportExport", "true".equals(sessionImportExportEnabled));
 		features.put("publicPool", "true".equals(publicPoolEnabled));
-
+		
 		// add public pool configuration on demand
 		if (features.get("publicPool")) {
 			config.put("publicPool", publicPool);

src/main/resources/arsnova.properties.example

@@ -166,6 +166,7 @@ connector.password=test
 # Enable MathJax to allow the use of Math formulas written in TeX syntax in
 # text fields.
 features.mathjax.enabled=true
+features.mathjax.src=//cdn.mathjax.org/mathjax/2.4-latest/MathJax.js
 
 # The following features are considered experimental because they have not been
 # tested in a production environment over a longer time frame and/or their

src/test/resources/arsnova.properties.example

@@ -166,6 +166,7 @@ connector.password=test
 # Enable MathJax to allow the use of Math formulas written in TeX syntax in
 # text fields.
 features.mathjax.enabled=true
+features.mathjax.src=//cdn.mathjax.org/mathjax/2.4-latest/MathJax.js
 
 # The following features are considered experimental because they have not been
 # tested in a production environment over a longer time frame and/or their