summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG2
-rw-r--r--config/main.inc.php.dist3
-rw-r--r--skins/classic/templates/login.html2
-rw-r--r--skins/larry/templates/login.html2
4 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 292c5f6e0..9787308a4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
CHANGELOG Roundcube Webmail
===========================
+- Don't show product version on login screen (can be enabled by config)
+- Renamed old default skin to 'classic'. Larry is the new default skin.
- Support connections to memcached socket file (#1488577)
- Enable TinyMCE inlinepopups plugin
- Update to TinyMCE 3.5.6
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 7cfed4ac9..12e6a960f 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -228,6 +228,9 @@ $rcmail_config['login_lc'] = false;
// Includes should be interpreted as PHP files
$rcmail_config['skin_include_php'] = false;
+// display software version on login screen
+$rcmail_config['display_version'] = false;
+
// Session lifetime in minutes
// must be greater than 'keep_alive'/60
$rcmail_config['session_lifetime'] = 10;
diff --git a/skins/classic/templates/login.html b/skins/classic/templates/login.html
index db5771fb1..63e09bb10 100644
--- a/skins/classic/templates/login.html
+++ b/skins/classic/templates/login.html
@@ -25,7 +25,7 @@
</div>
<div id="login-bottomline">
- Roundcube Webmail <roundcube:object name="version" />
+ <roundcube:var name="config:product_name"> <roundcube:object name="version" condition="config:display_version" />
<roundcube:if condition="config:support_url" />
&nbsp;&#9679;&nbsp; <a href="<roundcube:var name='config:support_url' />" target="_blank" class="support-link"><roundcube:label name="support" /></a>
<roundcube:endif />
diff --git a/skins/larry/templates/login.html b/skins/larry/templates/login.html
index c0ceb5c88..8aac930ed 100644
--- a/skins/larry/templates/login.html
+++ b/skins/larry/templates/login.html
@@ -24,7 +24,7 @@
</div>
<div id="bottomline">
- Roundcube Webmail <roundcube:object name="version" />
+ <roundcube:var name="config:product_name"> <roundcube:object name="version" condition="config:display_version" />
<roundcube:if condition="config:support_url" />
&nbsp;&#9679;&nbsp; <a href="<roundcube:var name='config:support_url' />" target="_blank" class="support-link"><roundcube:label name="support" /></a>
<roundcube:endif />