Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

This commit is contained in:
Uwe Steinmann 2016-09-06 14:49:22 +02:00
commit 8881ad1e74
28 changed files with 30 additions and 6 deletions

View File

@ -47,6 +47,7 @@
--------------------------------------------------------------------------------
Changes in version 4.3.29
--------------------------------------------------------------------------------
- started greek translation (thanks to ank-99)
- move guest authentication from inc/inc.ClassDbAuthentication.php into op/op.Login.php
- use jquery.validate for form validation
- new graph layout for workflow manager using cytoscape

View File

@ -1,4 +1,4 @@
VERSION=5.0.5
VERSION=5.0.6
SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi
# webapp

View File

@ -312,7 +312,7 @@ class SeedDMS_Core_DMS {
$this->callbacks = array();
$this->version = '@package_version@';
if($this->version[0] == '@')
$this->version = '5.0.5';
$this->version = '5.0.6';
} /* }}} */
/**

View File

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

View File

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

View File

@ -403,6 +403,7 @@ URL: [url]',
'edit_user' => 'تعديل المستخدم',
'edit_user_details' => 'تعديل بيانات المستخدم',
'edit_version' => '',
'el_GR' => '',
'email' => 'بريد الكتروني',
'email_error_title' => 'لمي يتم ادخال البريد الالكتروني',
'email_footer' => 'يمكنك دائما تغيير اعدادات بريدك الالكتروني من خلال خاصية - مستنداتي',

View File

@ -358,6 +358,7 @@ $text = array(
'edit_user' => 'Редактирай потребител',
'edit_user_details' => 'Редактирай данните на потребителя',
'edit_version' => '',
'el_GR' => '',
'email' => 'Email',
'email_error_title' => 'Email не е указан',
'email_footer' => 'Винаги можете да измените e-mail исползвайки функцията \'Моя учетка\'',

View File

@ -363,6 +363,7 @@ URL: [url]',
'edit_user' => 'Editar usuari...',
'edit_user_details' => 'Editar detalls d\'usuari',
'edit_version' => '',
'el_GR' => '',
'email' => 'Email',
'email_error_title' => '',
'email_footer' => 'Sempre es pot canviar la configuració de correu electrònic utilitzant les funcions de «El meu compte»',

View File

@ -410,6 +410,7 @@ URL: [url]',
'edit_user' => 'Upravit uživatele',
'edit_user_details' => 'Upravit podrobnosti uživatele',
'edit_version' => '',
'el_GR' => '',
'email' => 'E-mail',
'email_error_title' => 'Není zadána emailová adresa',
'email_footer' => 'Změnu nastavení e-mailu můžete kdykoliv provést pomocí funkce\'Můj účet\'',

View File

@ -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 (2291), dgrutsch (21)
// Translators: Admin (2292), dgrutsch (21)
$text = array(
'2_factor_auth' => '2-Faktor Authentifizierung',
@ -415,6 +415,7 @@ URL: [url]',
'edit_user' => 'Benutzer bearbeiten',
'edit_user_details' => 'Benutzerdetails bearbeiten',
'edit_version' => 'Version editieren',
'el_GR' => 'Griechisch',
'email' => 'Email',
'email_error_title' => 'Keine E-Mail-Adresse eingegeben',
'email_footer' => 'Sie können zu jeder Zeit Ihre E-Mail-Adresse über \'Mein Profil\' ändern.',

View File

@ -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 (1438), dgrutsch (7), netixw (14)
// Translators: Admin (1439), dgrutsch (7), netixw (14)
$text = array(
'2_factor_auth' => '2-factor authentication',
@ -415,6 +415,7 @@ URL: [url]',
'edit_user' => 'Edit user',
'edit_user_details' => 'Edit User Details',
'edit_version' => 'Edit version',
'el_GR' => 'Greek',
'email' => 'Email',
'email_error_title' => 'No email entered',
'email_footer' => 'You can always change your e-mail settings using \'My Account\' functions',

View File

@ -410,6 +410,7 @@ URL: [url]',
'edit_user' => 'Editar usuario...',
'edit_user_details' => 'Editar detalles de usuario',
'edit_version' => '',
'el_GR' => '',
'email' => 'Email',
'email_error_title' => 'No ha introducido un correo',
'email_footer' => 'Siempre se puede cambiar la configuración de correo electrónico utilizando las funciones de «Mi cuenta»',

View File

@ -410,6 +410,7 @@ URL: [url]',
'edit_user' => 'Modifier un utilisateur',
'edit_user_details' => 'Modifier les détails d\'utilisateur',
'edit_version' => '',
'el_GR' => '',
'email' => 'E-mail',
'email_error_title' => 'Aucun e-mail indiqué',
'email_footer' => 'Vous pouvez modifier les paramètres de messagerie via \'Mon compte\'.',

View File

@ -415,6 +415,7 @@ Internet poveznica: [url]',
'edit_user' => 'Uredi korisnika',
'edit_user_details' => 'Uredi detalje korisnika',
'edit_version' => '',
'el_GR' => '',
'email' => 'Email',
'email_error_title' => 'Nema ulaznog emaila',
'email_footer' => 'Koristeći funckcije \'Moj račun\' možete promijeniti postavke email obavještavanja.',

View File

@ -410,6 +410,7 @@ URL: [url]',
'edit_user' => 'Felhasználó szerkesztése',
'edit_user_details' => 'Felhasználó részletes adatainak szerkesztése',
'edit_version' => '',
'el_GR' => '',
'email' => 'Email',
'email_error_title' => 'Nem adott meg email címet',
'email_footer' => 'Bármikor módosíthatja email beállításait a \'My Account\' funkcióval',

View File

@ -416,6 +416,7 @@ URL: [url]',
'edit_user' => 'Modifica l\'utente',
'edit_user_details' => 'Modifica i dettagli utente',
'edit_version' => 'Versione editato',
'el_GR' => '',
'email' => 'Email',
'email_error_title' => 'Nessuna email immessa',
'email_footer' => 'Puoi cambiare l\'impostazione della tua email utilizzando le funzioni del menu \'Account personale\'',

View File

@ -415,6 +415,7 @@ URL: [url]',
'edit_user' => '사용자 편집',
'edit_user_details' => '사용자 세부 사항 편집',
'edit_version' => '',
'el_GR' => '',
'email' => '이메일',
'email_error_title' => '이메일 입력',
'email_footer' => '내 계정\'을 사용하여 전자 메일 설정을 변경 할 수 있습니다',

View File

@ -408,6 +408,7 @@ URL: [url]',
'edit_user' => 'Wijzig gebruiker',
'edit_user_details' => 'Wijzig gebruiker Details',
'edit_version' => '',
'el_GR' => '',
'email' => 'E-mail',
'email_error_title' => 'Geen email ingevoerd',
'email_footer' => 'U kunt altijd uw e-mail instellingen wijzigen via de \'Mijn Account\' opties',

View File

@ -403,6 +403,7 @@ URL: [url]',
'edit_user' => 'Edytuj użytkownika',
'edit_user_details' => 'Zmień dane użytkownika',
'edit_version' => '',
'el_GR' => '',
'email' => 'Email',
'email_error_title' => 'Nie wprowadzono adresu email',
'email_footer' => 'W każdej chwili możesz zmienić swój email używając zakładki \'Moje konto\'.',

View File

@ -409,6 +409,7 @@ URL: [url]',
'edit_user' => 'Editar usuário',
'edit_user_details' => 'Editar Perfil',
'edit_version' => '',
'el_GR' => '',
'email' => 'Email',
'email_error_title' => 'Nenhum email informado',
'email_footer' => 'You can always change your e-mail settings using \'My Account\' functions',

View File

@ -415,6 +415,7 @@ URL: [url]',
'edit_user' => 'Editează utilizator',
'edit_user_details' => 'Editează detalii utilizator',
'edit_version' => '',
'el_GR' => '',
'email' => 'Email',
'email_error_title' => 'Nici un email introdus',
'email_footer' => 'Puteți schimba oricând setările de e-mail folosind functionalitatile din \'Contul meu\'',

View File

@ -415,6 +415,7 @@ URL: [url]',
'edit_user' => 'Редактировать пользователя',
'edit_user_details' => 'Изменить данные пользователя',
'edit_version' => '',
'el_GR' => '',
'email' => 'E-mail',
'email_error_title' => 'Не указан e-mail',
'email_footer' => 'Вы можете изменить e-mail используя меню «Моя учётка».',

View File

@ -362,6 +362,7 @@ URL: [url]',
'edit_user' => 'Upraviť používateľa',
'edit_user_details' => 'Upraviť podrobnosti používateľa',
'edit_version' => '',
'el_GR' => '',
'email' => 'Email',
'email_error_title' => '',
'email_footer' => 'Nastavenia e-mailu si kedykoľvek môžete zmeniť cez \'Môj účet\'',

View File

@ -403,6 +403,7 @@ URL: [url]',
'edit_user' => 'Ändra användare',
'edit_user_details' => 'Ändra användarens information',
'edit_version' => '',
'el_GR' => '',
'email' => 'E-post',
'email_error_title' => 'E-post saknas',
'email_footer' => 'Du kan alltid ändra dina e-postinställningar genom att gå till \'Min Sida\'',

View File

@ -409,6 +409,7 @@ URL: [url]',
'edit_user' => 'Kullanıcıyı düzenle',
'edit_user_details' => 'Kullanıcı Detaylarını Düzenle',
'edit_version' => '',
'el_GR' => '',
'email' => 'E-posta',
'email_error_title' => 'E-posta adresi girilmedi',
'email_footer' => '\'My Account\' özelliklerini kullanarak her zaman e-posta ayarlarınızı değiştirebilirsiniz',

View File

@ -415,6 +415,7 @@ URL: [url]',
'edit_user' => 'Редагувати користувача',
'edit_user_details' => 'Змінити дані користувача',
'edit_version' => '',
'el_GR' => '',
'email' => 'E-mail',
'email_error_title' => 'Не вказано e-mail',
'email_footer' => 'Ви можете змінити e-mail використовуючи меню «Мій обліковий запис».',

View File

@ -364,6 +364,7 @@ URL: [url]',
'edit_user' => '编辑用户',
'edit_user_details' => '编辑用户详情',
'edit_version' => '',
'el_GR' => '',
'email' => 'Email',
'email_error_title' => '',
'email_footer' => '您可以用我的账户选项来改变您的e-mail设置',

View File

@ -362,6 +362,7 @@ URL: [url]',
'edit_user' => '編輯用戶',
'edit_user_details' => '編輯用戶詳情',
'edit_version' => '',
'el_GR' => '',
'email' => 'Email',
'email_error_title' => '',
'email_footer' => '您可以用我的帳戶選項來改變您的e-mail設置',