diff --git a/.gitignore b/.gitignore
index 732a19b99..6ac6ee7b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
*.tar.gz
SeedDMS_*/*.tgz
+ext/*
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 4f83ab793..a3168c316 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,7 +12,7 @@
uwe@steinmann.cxyes
- 2017-09-05
+ 2017-11-076.0.1
@@ -1530,7 +1530,7 @@ returns just users which are not disabled
2017-09-05
-
+
5.1.45.1.4
diff --git a/TODO b/TODO
index 5a54b295a..097943d42 100644
--- a/TODO
+++ b/TODO
@@ -2,16 +2,11 @@ Show workflow steps after document has been released (keep workflow tab)
Show documents in calendar when they where uploaded.
-Add attribute type 'date'
-
Update comment and date of a review/approval, if the same status is set
again. Currently setting the same status is turned of, because it didn't
have any effect, which is quite confusing if the user can do an operation
which has not the expected result.
-Show number of documents that needs care (approval, review, any other action
-in a workflog) next to Login/Logout-Menu.
-
Show message on doc info page if documents expects an action like review,
approval, etc.
@@ -34,23 +29,15 @@ Allow to specify fine grained notification (e.g. deleting a document, folder)
Have access rights depending on document status. This will allow to
restrict access when a document is in a workflow or has been rejected.
-There are still global variable in class SeedetoDMS_Bootstrap_Style
-
Settings::searchConfigFilePath() and Settings::getConfigDir() use different
approaches to get the configuration directory.
Show expiration status of documents in document list
-Export/Import content as xml (even for subfolders)
-
Copy folders recursivly
Allow operations like delete, move, approve, etc. on a list of documents
-Upload of multiple documents without an applet
-
-Do not show documents which are not reviewed or approved or rejected
-
installation script:
- user simply unpack the tar.gz in a server folder and access that folder
- on startup if there are installation problems php automatically run the configuration script
@@ -70,9 +57,6 @@ Sometimes in the DB are written messages strings in plain language whose
language depends on the current user and will never be translated.
This can be avoided using only coded messages
-The mail language is translated using the current user language but should use
-the receiver language (not easy).
-
In my Documents->all documents there should be two lists: one (the current) with
the user's document, and another with the user's updated document (that's because
one user could have updated a document not owned by himself)
diff --git a/inc/inc.Settings.php b/inc/inc.Settings.php
index 53b9005ed..ed3ae548e 100644
--- a/inc/inc.Settings.php
+++ b/inc/inc.Settings.php
@@ -92,6 +92,7 @@ if (get_magic_quotes_gpc()) {
unset($process);
}
+$indexconf = null;
if($settings->_enableFullSearch) {
if($settings->_fullSearchEngine == 'sqlitefts') {
$indexconf = array(
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 188f6049f..e8a5409cc 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
-// Translators: acabello (20), Admin (1040), angel (123), francisco (2), jaimem (14)
+// Translators: acabello (20), Admin (1041), angel (123), francisco (2), jaimem (14)
$text = array(
'2_factor_auth' => '',
@@ -319,7 +319,7 @@ URL: [url]',
'documentcontent' => 'Contenido del documento',
'documents' => 'Documentos',
'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => 'Documentos Caducos',
'documents_in_process' => 'Documentos en proceso',
'documents_locked' => '',
'documents_locked_by_you' => 'Documentos bloqueados por usted',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index e51d11efe..4d0140d2d 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
-// Translators: Admin (1052), aydin (83)
+// Translators: Admin (1053), aydin (83)
$text = array(
'2_factor_auth' => '',
@@ -318,7 +318,7 @@ URL: [url]',
'documentcontent' => '',
'documents' => 'Dokümanlar',
'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => 'Süresi dolan belgeler',
'documents_in_process' => 'İşlemdeki Dokümanlar',
'documents_locked' => '',
'documents_locked_by_you' => 'Doküman sizin tarafınızdan kilitlendi',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 8f0ada7d3..799dcd108 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
-// Translators: Admin (732), archonwang (469), fengjohn (5)
+// Translators: Admin (733), archonwang (469), fengjohn (5)
$text = array(
'2_factor_auth' => '双重认证',
@@ -320,7 +320,7 @@ URL: [url]',
'documentcontent' => '文档内容',
'documents' => '文档',
'documents_checked_out_by_you' => '您签出的文档',
-'documents_expired' => '',
+'documents_expired' => '过期的文档',
'documents_in_process' => '待处理文档',
'documents_locked' => '已锁定的文档',
'documents_locked_by_you' => '被您锁定的文档',
diff --git a/op/op.Login.php b/op/op.Login.php
index c4002a295..9aef9ef76 100644
--- a/op/op.Login.php
+++ b/op/op.Login.php
@@ -33,7 +33,7 @@ include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc";
function _printMessage($heading, $message) { /* {{{ */
global $dms, $theme;
- $view = UI::factory($theme, 'ErrorDlg', array('dms'=>$dms));
+ $view = UI::factory($theme, 'Login', array('dms'=>$dms));
$view->exitError($heading, $message, true);
return;
} /* }}} */
diff --git a/views/bootstrap/images/empty.svg b/views/bootstrap/images/empty.svg
new file mode 100644
index 000000000..772a3c0dc
--- /dev/null
+++ b/views/bootstrap/images/empty.svg
@@ -0,0 +1,466 @@
+
+
+
+