From a495f5e0ba443f8246140365e56cb777f0f25331 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 15 Apr 2015 16:15:32 +0200 Subject: [PATCH 001/239] minor updates --- languages/ar_EG/lang.inc | 2 ++ languages/bg_BG/lang.inc | 2 ++ languages/ca_ES/lang.inc | 2 ++ languages/cs_CZ/lang.inc | 2 ++ languages/de_DE/lang.inc | 6 ++++-- languages/en_GB/lang.inc | 6 ++++-- languages/es_ES/lang.inc | 2 ++ languages/fr_FR/lang.inc | 2 ++ languages/hu_HU/lang.inc | 2 ++ languages/it_IT/lang.inc | 2 ++ languages/nl_NL/lang.inc | 2 ++ languages/pl_PL/lang.inc | 2 ++ languages/pt_BR/lang.inc | 2 ++ languages/ro_RO/lang.inc | 2 ++ languages/ru_RU/lang.inc | 2 ++ languages/sk_SK/lang.inc | 2 ++ languages/sv_SE/lang.inc | 2 ++ languages/tr_TR/lang.inc | 2 ++ languages/zh_CN/lang.inc | 2 ++ languages/zh_TW/lang.inc | 2 ++ 20 files changed, 44 insertions(+), 4 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 681565841..3a4c19b77 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -136,6 +136,8 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - تم تغيير سمة', 'attribute_count' => 'ﻉﺩﺩ ﻡﺭﺎﺗ ﺍﻸﺴﺘﺧﺩﺎﻣ', 'attribute_value' => 'ﻖﻴﻣﺓ ﺎﻠﺴﻣﺓ', +'attr_malformed_email' => '', +'attr_malformed_url' => '', 'attr_max_values' => '', 'attr_min_values' => '', 'attr_no_regex_match' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 8adac7447..20b7e65ed 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -121,6 +121,8 @@ $text = array( 'attribute_changed_email_subject' => '', 'attribute_count' => '', 'attribute_value' => '', +'attr_malformed_email' => '', +'attr_malformed_url' => '', 'attr_max_values' => '', 'attr_min_values' => '', 'attr_no_regex_match' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index ef9cf394e..1407298c4 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -126,6 +126,8 @@ URL: [url]', 'attribute_changed_email_subject' => '', 'attribute_count' => '', 'attribute_value' => '', +'attr_malformed_email' => '', +'attr_malformed_url' => '', 'attr_max_values' => '', 'attr_min_values' => '', 'attr_no_regex_match' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 7a7120dc7..b6c9b9423 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -143,6 +143,8 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Atributy změněny', 'attribute_count' => 'Počet použití', 'attribute_value' => 'Hodnota atributu', +'attr_malformed_email' => '', +'attr_malformed_url' => '', 'attr_max_values' => 'Maximální počet pažadovaných hodnot pro atribut [attrname] je překročen.', 'attr_min_values' => 'Není dosaženo minimálního počtu požadovaných hodnot pro atribut [attrname].', 'attr_no_regex_match' => 'Hodnota atributu nesouhlasí s regulárním výrazem', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 7322f5dda..ae9f6dd37 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/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 (1967), dgrutsch (18) +// Translators: Admin (1971), dgrutsch (18) $text = array( 'accept' => 'Übernehmen', @@ -148,9 +148,11 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Attribut geändert', 'attribute_count' => 'Anzahl Verwendungen', 'attribute_value' => 'Attributwert', +'attr_malformed_email' => 'Der Attributwert \'[value]\' des Attributs \'[attrname]\' ist keine gültige E-Mail.', +'attr_malformed_url' => 'Der Attributwert \'[value]\' des Attributs \'[attrname]\' ist keine gültige URL.', 'attr_max_values' => 'Die maximale Anzahl der erlaubten Werte für das Attribut [attrname] ist überschritten.', 'attr_min_values' => 'Die minimal Anzahl von Werte für das Attribut [attrname] ist nicht erreicht.', -'attr_no_regex_match' => 'The attribute value does not match the regular expression', +'attr_no_regex_match' => 'Der Attributwert \'[value]\' des Attributs \'[attrname]\' passt nicht zum regulären Ausdruck \'[regex]\'', 'at_least_n_users_of_group' => 'Mindestens [number_of_users] Benutzer der Gruppe [group]', 'august' => 'August', 'authentication' => 'Authentifizierung', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 55d438712..2d08b1cdb 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/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 (1093), dgrutsch (3), netixw (14) +// Translators: Admin (1097), dgrutsch (3), netixw (14) $text = array( 'accept' => 'Accept', @@ -148,9 +148,11 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Attribute changed', 'attribute_count' => 'Number of uses', 'attribute_value' => 'Value of attribute', +'attr_malformed_email' => 'The attribute value \'[value]\' of attribute \'[attrname]\' is not a valid URL.', +'attr_malformed_url' => 'The attribute value \'[value]\' of attribute \'[attrname]\' is not a valid URL.', 'attr_max_values' => 'The maximum number of required values for attributes [attrname] is exceeded.', 'attr_min_values' => 'The minimum number of required values for attributes [attrname] is not reached.', -'attr_no_regex_match' => 'The attribute value does not match the regular expression', +'attr_no_regex_match' => 'The attribute value \'[value]\' for attribute \'[attrname]\' does not match the regular expression \'[regex]\'', 'at_least_n_users_of_group' => 'At least [number_of_users] users of [group]', 'august' => 'August', 'authentication' => 'Authentication', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 6bd1c16f7..450dc14c4 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -143,6 +143,8 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Atributo modificado', 'attribute_count' => 'Cantidad de usos', 'attribute_value' => 'Valor del atributo', +'attr_malformed_email' => '', +'attr_malformed_url' => '', 'attr_max_values' => '', 'attr_min_values' => '', 'attr_no_regex_match' => 'El valor del atributo no concuerda con la expresión regular', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index a06ee382a..9373f146c 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -143,6 +143,8 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Attribut changé', 'attribute_count' => 'Nombre d\'utilisations', 'attribute_value' => 'Valeur de l\'attribut', +'attr_malformed_email' => '', +'attr_malformed_url' => '', 'attr_max_values' => 'Le nombre maximum de valeurs pour l\'attribut [attrname] est dépassé', 'attr_min_values' => 'Le nombre minimum de valeurs pour l\'attribut [attrname] n\'est pas atteint', 'attr_no_regex_match' => 'La valeur de l\'attribut ne correspond pas à l\'expression régulière.', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 3ebe3c594..dca750eea 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -143,6 +143,8 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Jellemző módosult', 'attribute_count' => 'Felhasználók száma', 'attribute_value' => 'Tulajdonság értéke', +'attr_malformed_email' => '', +'attr_malformed_url' => '', 'attr_max_values' => '', 'attr_min_values' => '', 'attr_no_regex_match' => 'A jellemző értéke nem felel meg a szabályos kifejezésnek', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 447199345..cdda37458 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -148,6 +148,8 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Attributo modificato', 'attribute_count' => 'Numero di utilizzi', 'attribute_value' => 'Valore dell\'Attributo', +'attr_malformed_email' => '', +'attr_malformed_url' => '', 'attr_max_values' => 'Il numero massimo dei valori richiesti per l\'Attributo [attrname] è superato.', 'attr_min_values' => 'Il numero minimo di valori richiesti per l\'Attributo [attrname] non è raggiunto.', 'attr_no_regex_match' => 'Il valore dell\'Attributo non è conforme ad un\'espressione regolare.', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 88ccb037b..111412847 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -136,6 +136,8 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Attribuut gewijzigd', 'attribute_count' => 'Aantal maal gebruikt', 'attribute_value' => 'Waarde van het attribuut', +'attr_malformed_email' => '', +'attr_malformed_url' => '', 'attr_max_values' => '', 'attr_min_values' => '', 'attr_no_regex_match' => 'De waarde van het attribuut komt niet overeen met de veelgebruikte uitdrukking (regular expression)', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index e56b14d6b..85500c9cb 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -136,6 +136,8 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Zmiana atrybutu', 'attribute_count' => 'liczba użyć', 'attribute_value' => 'wartość atrybutu', +'attr_malformed_email' => '', +'attr_malformed_url' => '', 'attr_max_values' => '', 'attr_min_values' => '', 'attr_no_regex_match' => 'Wartość atrybutu nie pasuje do wyrażenia regularnego', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 1911857a0..7628364b6 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -143,6 +143,8 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Atributo modificado', 'attribute_count' => 'Número de utilizações', 'attribute_value' => 'Valor do atributo', +'attr_malformed_email' => '', +'attr_malformed_url' => '', 'attr_max_values' => '', 'attr_min_values' => '', 'attr_no_regex_match' => 'O valor do atributo não corresponde à expressão regular', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index eefb71276..bb3a63e0f 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -143,6 +143,8 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Atribut schimbat', 'attribute_count' => 'Numărul de utilizări', 'attribute_value' => 'Valoare atribut', +'attr_malformed_email' => '', +'attr_malformed_url' => '', 'attr_max_values' => 'Numărul maxim de valori necesare pentru atributul [attrname] este depășit.', 'attr_min_values' => 'Numărul minim de valori necesare pentru atributul [attrname] nu este atins.', 'attr_no_regex_match' => 'Valoarea atributului nu se potrivește cu expresia regulată', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index bdd40d181..fedabbdf6 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -136,6 +136,8 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: изменён атрибут «[name]»', 'attribute_count' => 'Использован раз', 'attribute_value' => 'Значение атрибута', +'attr_malformed_email' => '', +'attr_malformed_url' => '', 'attr_max_values' => '', 'attr_min_values' => '', 'attr_no_regex_match' => 'Значение атрибута не соответствует регулярному выражению', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index f75c95601..708ddc74f 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -121,6 +121,8 @@ $text = array( 'attribute_changed_email_subject' => '', 'attribute_count' => '', 'attribute_value' => '', +'attr_malformed_email' => '', +'attr_malformed_url' => '', 'attr_max_values' => '', 'attr_min_values' => '', 'attr_no_regex_match' => '', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 98ad87423..543d4600d 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -136,6 +136,8 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Ändrad attribut', 'attribute_count' => 'Antal användningar', 'attribute_value' => 'Attributvärde', +'attr_malformed_email' => '', +'attr_malformed_url' => '', 'attr_max_values' => '', 'attr_min_values' => '', 'attr_no_regex_match' => 'Värdet av attributet stämmer inte överens med regulära uttrycket', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 964759579..a1dbacb35 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -142,6 +142,8 @@ URL: [url]', 'attribute_changed_email_subject' => '[sitename]: [name] - Nitelik değişti', 'attribute_count' => 'Kullanım sayısı', 'attribute_value' => 'Niteliğin değeri', +'attr_malformed_email' => '', +'attr_malformed_url' => '', 'attr_max_values' => '[attrname] niteliği için maksimum gerekli olan değer aşıldı.', 'attr_min_values' => '[attrname] niteliği için minimum gerekli olan değere ulaşılmadı.', 'attr_no_regex_match' => 'Nitelik değeri düzenli ifade ile eşleşmiyor', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index cb1efbcdb..8993ad6dd 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -125,6 +125,8 @@ URL: [url]', 'attribute_changed_email_subject' => '', 'attribute_count' => '使用次数', 'attribute_value' => '属性值', +'attr_malformed_email' => '', +'attr_malformed_url' => '', 'attr_max_values' => '', 'attr_min_values' => '', 'attr_no_regex_match' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index f0700bba8..03512c2d1 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -125,6 +125,8 @@ URL: [url]', 'attribute_changed_email_subject' => '', 'attribute_count' => '使用次數', 'attribute_value' => '屬性值', +'attr_malformed_email' => '', +'attr_malformed_url' => '', 'attr_max_values' => '', 'attr_min_values' => '', 'attr_no_regex_match' => '', From 171727768447c16639de291e578636d12127f9be Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 15 Apr 2015 21:19:02 +0200 Subject: [PATCH 002/239] set version to 5.0.0-pre3 --- Makefile | 2 +- SeedDMS_Core/Core/inc.ClassDMS.php | 2 +- SeedDMS_Core/package.xml | 22 +++++++++++++++++++--- inc/inc.Version.php | 2 +- install/install.php | 2 +- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 0438b2055..ad630593c 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=4.3.17 +VERSION=5.0.0-pre3 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 diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 0dfb4925f..ce53de34c 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -295,7 +295,7 @@ class SeedDMS_Core_DMS { $this->classnames['group'] = 'SeedDMS_Core_Group'; $this->version = '@package_version@'; if($this->version[0] == '@') - $this->version = '4.3.17'; + $this->version = '5.0.0'; } /* }}} */ /** diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index dec22bda9..ba2e45a20 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,11 +12,11 @@ uwe@steinmann.cx yes - 2015-03-27 + 2015-04-15 - 4.3.17 - 4.3.17 + 5.0.0 + 5.0.0 stable @@ -815,5 +815,21 @@ users returned by SeedDMS_Core_DMS::getAllUsers() have language and theme set ag no changes + + 2015-03-27 + + + 4.3.17 + 4.3.17 + + + stable + stable + + GPL License + +clean workflow log when a document version was deleted + + diff --git a/inc/inc.Version.php b/inc/inc.Version.php index bf7a626a5..46170de48 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { - public $_number = "4.3.17"; + public $_number = "5.0.0-pre3"; private $_string = "SeedDMS"; function SeedDMS_Version() { diff --git a/install/install.php b/install/install.php index 372430caf..3605f59c4 100644 --- a/install/install.php +++ b/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-pre3"); require_once('../inc/inc.ClassSettings.php'); From f02917d5aa0ed45f02a9b8e49e755bfda473f94b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 16 Apr 2015 08:11:05 +0200 Subject: [PATCH 003/239] set proper active pane after saving configuration --- views/bootstrap/class.Settings.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index b329477e9..afbbeb895 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -71,7 +71,7 @@ if(!is_writeable($settings->_configFilePath)) {
-
+
contentContainerStart(); ?>