show the channel. Also mark git as git channel so that someone can see where this...

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index d51a22b72a42f8835ddba21be1c26ac6231599f6..1091b1dab54af9e9095e353ecca699051b625ecb 100644 (file)
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -248,7 +248,7 @@ endfor;?>
 
 <fieldset class="personalblock">
        <h2><?php p($l->t('Version'));?></h2>
-       <strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getVersionString()); ?>
+       <strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getVersionString().' ('.OC_Util::getChannel().')'); ?>
 <?php if (OC_Util::getEditionString() === ''): ?>
        <p>
                <?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>

diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 1be7be578d3069c5e0ba6cb8e04799608f37f93d..60c509b4a1cab2de8beee9ab463c973d3816257e 100644 (file)
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -167,7 +167,7 @@ if($_['passwordChangeSupported']) {
 
 <fieldset class="personalblock">
        <h2><?php p($l->t('Version'));?></h2>
-       <strong><?php p($theme->getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?><br/>
+       <strong><?php p($theme->getName()); ?></strong> <?php p(OC_Util::getVersionString().' ('.OC_Util::getChannel().')'); ?><br />
 <?php if (OC_Util::getEditionString() === ''): ?>
        <?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
 <?php endif; ?>

diff --git a/version.php b/version.php
index b3e34b5df4b969177eb912fd051b3d52d79251d7..8386ee6f8751a6c9db3b9c97954ccc2746dbec13 100644 (file)
--- a/version.php
+++ b/version.php
@@ -10,7 +10,7 @@ $OC_VersionString='6.0 alpha 1';
 $OC_Edition='';
 
 // The ownCloud channel
-$OC_Channel='';
+$OC_Channel='git';
 
 // The build number
 $OC_Build='';