Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge

Jarrett Jordaan
2 parents 6bdf2859 ccb0e62a
Showing 14 changed files with 17 additions and 23 deletions
.gitignore
clienttools/.gitignore
ktwebservice/KTDownloadManager.inc.php
ktwebservice/KTUploadManager.inc.php
ktwebservice/KTWebService.php
ktwebservice/checkup.php
ktwebservice/download.php
ktwebservice/download_cleanup.php
ktwebservice/index.php
ktwebservice/json.php
ktwebservice/upload.php
plugins/multiselect/BulkImport.php
plugins/multiselect/BulkUpload.php
thirdpartyjs/jquery/jquery_noconflict.js
 *~
 bin/luceneserver/lucene.pid
+bin/schedulerTask.sh 
 *.tmproj
 .DS_Store
 .buildpath
-*~
-bin/luceneserver/lucene.pid
-*.tmproj
-.DS_Store
-.buildpath
-.project
-.settings/
-dummy.php
-var/*
-plugins/commercial
@@ -9,7 +9,7 @@
  * KnowledgeTree Community Edition
  * Document Management Made Simple
  * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * Portions copyright The Jam Warehouse Software (Pty) Limited
+ * 
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
@@ -9,7 +9,7 @@
  * KnowledgeTree Community Edition
  * Document Management Made Simple
  * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * Portions copyright The Jam Warehouse Software (Pty) Limited
+ * 
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
@@ -5,7 +5,7 @@
  * KnowledgeTree Community Edition
  * Document Management Made Simple
  * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * Portions copyright The Jam Warehouse Software (Pty) Limited
+ * 
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
@@ -671,4 +671,4 @@ $ws-&gt;handle();
 exit();
-?>
 \ No newline at end of file
+?>
@@ -32,4 +32,4 @@ $uploadsWritable = !is_writable($uploadsDir)?&#39;The upload directory is not writab
 	<td>Upload Directory Writable</td>
 	<td><?php print $uploadsWritable?></td>
 </tr>
-</table>
 \ No newline at end of file
+</table>
@@ -7,7 +7,7 @@
  * KnowledgeTree Community Edition
  * Document Management Made Simple
  * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * Portions copyright The Jam Warehouse Software (Pty) Limited
+ * 
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
@@ -81,4 +81,4 @@ if (PEAR::isError($response))
 	exit;
 }
-?>
 \ No newline at end of file
+?>
@@ -9,7 +9,7 @@
  * KnowledgeTree Community Edition
  * Document Management Made Simple
  * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * Portions copyright The Jam Warehouse Software (Pty) Limited
+ * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
@@ -9,7 +9,7 @@
  * KnowledgeTree Community Edition
  * Document Management Made Simple
  * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * Portions copyright The Jam Warehouse Software (Pty) Limited
+ * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
@@ -3,4 +3,4 @@
 define('JSON_WEBSERVICE',1);
 require_once('webservice.php');
-?>
 \ No newline at end of file
+?>
@@ -9,7 +9,7 @@
  * KnowledgeTree Community Edition
  * Document Management Made Simple
  * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * Portions copyright The Jam Warehouse Software (Pty) Limited
+ * 
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
@@ -207,4 +207,4 @@ function respond($code, $msg, $uploads=array())
 }
-?>
 \ No newline at end of file
+?>
@@ -65,11 +65,12 @@ class InetBulkImportFolderMultiSelectAction extends KTFolderAction {
 			$js .= "<script src='plugins/multiselect/js/hidelink.js' type='text/javascript'></script>";
 			$aJavascript[] = 'thirdpartyjs/jquery/jquery-1.3.2.js';
+			$aJavascript[] = 'thirdpartyjs/jquery/jquery_noconflict.js';
+			
 			$oPage =& $GLOBALS['main'];			
 			if (method_exists($oPage, 'requireJSResources')) {
 				$oPage->requireJSResources($aJavascript);
 			}
-			
 	        return $js._kt('Import from Server Location');
 		}
 		else
@@ -67,6 +67,7 @@ class InetBulkUploadFolderAction extends KTFolderAction {
 		if(!KTPluginUtil::pluginIsActive('inet.foldermetadata.plugin'))
 		{
 			$aJavascript[] = 'thirdpartyjs/jquery/jquery-1.3.2.js';
+			$aJavascript[] = 'thirdpartyjs/jquery/jquery_noconflict.js';
 			$oPage =& $GLOBALS['main'];			
 			if (method_exists($oPage, 'requireJSResources')) {
+jQuery.noConflict();