Merge branch 'master' of git.thm.de:arsnova/arsnova-backend into feature_session_info

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

@@ -139,12 +139,6 @@ public class ConfigurationController extends AbstractController {
 	@Value("${optional.arsnova-slogan:}")
 	private String arsnovaSlogan;
 
-	@Value("${optional.unipanel-enabled:}")
-	private String uniPanelEnabled;
-
-	@Value("${optional.unipanel-text:}")
-	private String uniPanelText;
-
 	@Value("${pp.session-levels.de}")
 	private String ppLevelsDe;
 
@@ -201,12 +195,6 @@ public class ConfigurationController extends AbstractController {
 		if (!"".equals(arsnovaSlogan)) {
 			config.put("arsnovaSlogan", arsnovaSlogan);
 		}
-		if (!"".equals(uniPanelEnabled)) {
-			config.put("uniPanelEnabled", uniPanelEnabled);
-		}
-		if (!"".equals(uniPanelText)) {
-			config.put("uniPanelText", uniPanelText);
-		}
 		if (!"".equals(maxUploadFilesize)) {
 			config.put("maxUploadFilesize", maxUploadFilesize);
 		}

src/main/resources/arsnova.properties.example

@@ -213,10 +213,6 @@ session.demo-id=
 # label underneath ARSnova logo
 optional.arsnova-slogan=Audience Response System
 
-# optional: Panel with Text about the University
-optional.unipanel-enabled=false
-optional.unipanel-text=Placeholder for UniPanel-Text
-
 # Links which are displayed in the frontend applications
 #
 links.blog.url=https://arsnova.eu/blog/

src/test/resources/arsnova.properties.example

@@ -213,10 +213,6 @@ session.demo-id=
 # label underneath ARSnova logo
 optional.arsnova-slogan=Audience Response System
 
-# optional: Panel with Text about the University
-optional.unipanel-enabled=false
-optional.unipanel-text=Placeholder for UniPanel-Text
-
 # Links which are displayed in the frontend applications
 #
 links.blog.url=https://arsnova.eu/blog/