Merge branch 'seeddms-5.0.x' into develop

CHANGELOG

@@ -43,6 +43,7 @@
 - fix take over of reviewers/approvers from previos version
 - fix calculation of quota in user list
 - do not show hidden users in select box of search form
+- notifier can be set when new document is uploaded
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.16

Makefile

@@ -1,4 +1,4 @@
-VERSION=4.3.17
+VERSION=5.0.0
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers README.md README.Notification README.Ubuntu drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi
 # webapp
 

SeedDMS_Core/Core/inc.ClassDMS.php

@@ -357,7 +357,7 @@ class SeedDMS_Core_DMS {
 		$this->classnames['transmittalitem'] = 'SeedDMS_Core_TransmittalItem';
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '4.3.17';
+			$this->version = '5.0.0';
 	} /* }}} */
 
 	/**

SeedDMS_Core/package.xml

@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2015-03-27</date>
+ <date>2015-04-15</date>
  <time>08:02:04</time>
  <version>
-  <release>4.3.17</release>
-  <api>4.3.17</api>
+  <release>5.0.0</release>
+  <api>5.0.0</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,7 +24,8 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-clean workflow log when a document version was deleted
+- classes can be overloaded
+- clean workflow log when a document version was deleted
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -818,5 +819,38 @@ users returned by SeedDMS_Core_DMS::getAllUsers() have language and theme set ag
 no changes
    </notes>
   </release>
+  <release>
+   <date>2015-03-27</date>
+   <time>08:02:04</time>
+   <version>
+    <release>4.3.17</release>
+    <api>4.3.17</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+clean workflow log when a document version was deleted
+   </notes>
+  </release>
+  <release>
+   <date>2015-06-09</date>
+   <time>11:26:18</time>
+   <version>
+    <release>4.3.18</release>
+    <api>4.3.18</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- add optional paramter $msg to SeedDMS_Core_DocumentContent::verifyStatus()
+- add method SeedDMS_Core_DMS::getDuplicateDocumentContent()
+   </notes>
+  </release>
  </changelog>
 </package>

inc/inc.Version.php

@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "4.3.17";
+	public $_number = "5.0.0";
 	private $_string = "SeedDMS";
 
 	function SeedDMS_Version() {

install/install.php

@@ -119,7 +119,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "4.3.17");
+define("SEEDDMS_VERSION", "5.0.0");
 
 require_once('../inc/inc.ClassSettings.php');
 

languages/fr_FR/lang.inc

@@ -166,7 +166,7 @@ URL: [url]',
 'backup_remove' => 'Supprimer le fichier de sauvegarde',
 'backup_tools' => 'Outils de sauvegarde',
 'between' => 'entre',
-'bg_BG' => '',
+'bg_BG' => 'Bulgare',
 'browse' => 'Parcourir',
 'calendar' => 'Agenda',
 'calendar_week' => 'Semaine',
@@ -1215,7 +1215,7 @@ URL: [url]',
 'tuesday' => 'Mardi',
 'tuesday_abbr' => 'Mar.',
 'type_to_search' => 'Effectuer une recherche',
-'uk_UA' => '',
+'uk_UA' => 'Ukrainien',
 'under_folder' => 'Dans le dossier',
 'unknown_attrdef' => '',
 'unknown_command' => 'Commande non reconnue.',

views/bootstrap/class.Bootstrap.php

@@ -446,8 +446,6 @@ $(document).ready(function () {
 	function pageNavigation($pageTitle, $pageType=null, $extra=null) { /* {{{ */
 
 		if ($pageType!=null && strcasecmp($pageType, "noNav")) {
-			if($pageType == "view_folder" || $pageType == "view_document")
-				echo $pageTitle."\n";
 			echo "<div class=\"navbar\">\n";
 			echo " <div class=\"navbar-inner\">\n";
 			echo "  <div class=\"container\">\n";
@@ -479,6 +477,8 @@ $(document).ready(function () {
 			echo " 	</div>\n";
 			echo " </div>\n";
 			echo "</div>\n";
+			if($pageType == "view_folder" || $pageType == "view_document")
+				echo $pageTitle."\n";
 		} else {
 			echo "<legend>".$pageTitle."</legend>\n";
 		}

views/bootstrap/class.ViewDocument.php

@@ -107,7 +107,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					</td>
 		    </tr>
 <?php
-	
 	} /* }}} */
 
 	function show() { /* {{{ */