From: cweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f>
Date: Mon, 16 Nov 2009 19:19:11 +0000 (+0000)
Subject: fix dojo multicombobox bug; prepare 0.95.1
X-Git-Tag: v0.97~150
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=a254b2df97e669bbd38b809a55c5524a9b1343d2;p=semanticscuttle.git

fix dojo multicombobox bug; prepare 0.95.1

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@549 b3834d28-1941-0410-a4f8-b48e95affb8f
---

diff --git a/data/templates/about.tpl.php b/data/templates/about.tpl.php
index 4a93d75..39775c9 100644
--- a/data/templates/about.tpl.php
+++ b/data/templates/about.tpl.php
@@ -17,7 +17,7 @@ $this->includeTemplate($GLOBALS['top_include']);
 
 
 <?php if(!is_null($currentUser) && $currentUser->isAdmin()): ?>
-<li>SemanticScuttle v0.94</li>
+<li>SemanticScuttle v0.95.1</li>
 <?php endif ?>
 </ul>
 
diff --git a/data/templates/dojo.inc.php b/data/templates/dojo.inc.php
index 16b22c6..366dcfe 100644
--- a/data/templates/dojo.inc.php
+++ b/data/templates/dojo.inc.php
@@ -24,7 +24,7 @@
 <?php if (isset($loadjs)) :?>
 <script type="text/javascript"
 	src="http://ajax.googleapis.com/ajax/libs/dojo/1.2/dojo/dojo.xd.js"
-	djConfig="parseOnLoad:true, isDebug:<?php echo DEBUG_MODE?'true':'false' ?>, usePlainJson:true, baseUrl: '<?php echo ROOT ?>', modulePaths: {'js': 'includes/js'}"></script>
+	djConfig="parseOnLoad:true, isDebug:<?php echo DEBUG_MODE?'true':'false' ?>, usePlainJson:true, baseUrl: '<?php echo ROOT ?>', modulePaths: {'js': 'js'}"></script>
  
 <script type="text/javascript">
 dojo.require("dojo.parser");
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 2686ca6..1dcb6a8 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,6 +1,12 @@
 ChangeLog for SemantiScuttle
 ============================
 
+0.95.1 - 2009-11-16
+-------------------
+- Fix bug: admin tags were not shown because javascript include was broken.
+  Thanks, Jean-Luc!
+
+
 0.95 - 2009-11-10
 -----------------
 - Implement request #2878169: Voting system with two layouts
@@ -21,6 +27,14 @@ ChangeLog for SemantiScuttle
   translation. Choose the translation you like most.
 
 
+0.94.1 - 2009-10-29
+-------------------
+This is a security release! We do highly recommend to update
+your SemanticScuttle installations!
+
+- Fix several XSS possibilities
+
+
 0.94 - 2009-10-02
 -----------------
 - Fix bug #2834070: unfreed sql results