diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2016-08-16 18:31:59 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2016-08-16 18:31:59 +0200 |
| commit | 717e22267a1c23dda1b25b9d01bb1fada9ce8ab7 (patch) | |
| tree | 544774d1018e19d462e79360b3fc86b6cdd39b16 /apps/files_external | |
| parent | 4946cc220de5926ef86dc8557ffb5c990f6482d3 (diff) | |
| parent | 9db189174c26326bbb58d96f614a415cd15542d1 (diff) | |
| download | nextcloud-server-717e22267a1c23dda1b25b9d01bb1fada9ce8ab7.tar.gz nextcloud-server-717e22267a1c23dda1b25b9d01bb1fada9ce8ab7.zip | |
Merge branch 'master' into implement_712
Diffstat (limited to 'apps/files_external')
| -rw-r--r-- | apps/files_external/appinfo/database.xml | 2 | ||||
| -rw-r--r-- | apps/files_external/l10n/cs_CZ.js | 3 | ||||
| -rw-r--r-- | apps/files_external/l10n/cs_CZ.json | 3 | ||||
| -rw-r--r-- | apps/files_external/l10n/pt_BR.js | 3 | ||||
| -rw-r--r-- | apps/files_external/l10n/pt_BR.json | 3 | ||||
| -rw-r--r-- | apps/files_external/lib/Service/DBConfigService.php | 2 |
6 files changed, 10 insertions, 6 deletions
diff --git a/apps/files_external/appinfo/database.xml b/apps/files_external/appinfo/database.xml index 54ee642ead6..e39144931a7 100644 --- a/apps/files_external/appinfo/database.xml +++ b/apps/files_external/appinfo/database.xml @@ -144,7 +144,7 @@ <field> <name>value</name> <type>text</type> - <notnull>true</notnull> + <notnull>false</notnull> <length>4096</length> </field> diff --git a/apps/files_external/l10n/cs_CZ.js b/apps/files_external/l10n/cs_CZ.js index 388207ca91c..151463d4df5 100644 --- a/apps/files_external/l10n/cs_CZ.js +++ b/apps/files_external/l10n/cs_CZ.js @@ -126,6 +126,7 @@ OC.L10N.register( "Advanced settings" : "Pokročilá nastavení", "Delete" : "Smazat", "Allow users to mount external storage" : "Povolit uživatelům připojení externího úložiště", - "Allow users to mount the following external storage" : "Povolit uživatelů připojit následující externí úložiště" + "Allow users to mount the following external storage" : "Povolit uživatelů připojit následující externí úložiště", + "Access granted" : "Přístup povolen" }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/files_external/l10n/cs_CZ.json b/apps/files_external/l10n/cs_CZ.json index 0b349a5b447..a309c90dc72 100644 --- a/apps/files_external/l10n/cs_CZ.json +++ b/apps/files_external/l10n/cs_CZ.json @@ -124,6 +124,7 @@ "Advanced settings" : "Pokročilá nastavení", "Delete" : "Smazat", "Allow users to mount external storage" : "Povolit uživatelům připojení externího úložiště", - "Allow users to mount the following external storage" : "Povolit uživatelů připojit následující externí úložiště" + "Allow users to mount the following external storage" : "Povolit uživatelů připojit následující externí úložiště", + "Access granted" : "Přístup povolen" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js index 99aa844fb5b..59cd872b065 100644 --- a/apps/files_external/l10n/pt_BR.js +++ b/apps/files_external/l10n/pt_BR.js @@ -126,6 +126,7 @@ OC.L10N.register( "Advanced settings" : "Configurações avançadas", "Delete" : "Excluir", "Allow users to mount external storage" : "Permitir que usuários montem armazenamento externo", - "Allow users to mount the following external storage" : "Permitir que usuários montem o seguinte armazenamento externo" + "Allow users to mount the following external storage" : "Permitir que usuários montem o seguinte armazenamento externo", + "Access granted" : "Acesso concedido" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json index aee79057b4d..12d002be649 100644 --- a/apps/files_external/l10n/pt_BR.json +++ b/apps/files_external/l10n/pt_BR.json @@ -124,6 +124,7 @@ "Advanced settings" : "Configurações avançadas", "Delete" : "Excluir", "Allow users to mount external storage" : "Permitir que usuários montem armazenamento externo", - "Allow users to mount the following external storage" : "Permitir que usuários montem o seguinte armazenamento externo" + "Allow users to mount the following external storage" : "Permitir que usuários montem o seguinte armazenamento externo", + "Access granted" : "Acesso concedido" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_external/lib/Service/DBConfigService.php b/apps/files_external/lib/Service/DBConfigService.php index a94b73772e7..61cca9a0224 100644 --- a/apps/files_external/lib/Service/DBConfigService.php +++ b/apps/files_external/lib/Service/DBConfigService.php @@ -208,7 +208,7 @@ class DBConfigService { 'type' => $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT) ]); $query->execute(); - return (int)$this->connection->lastInsertId('external_mounts'); + return (int)$this->connection->lastInsertId('*PREFIX*external_mounts'); } /** |