aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/controller/apicontroller.php3
-rw-r--r--apps/files/index.php1
-rw-r--r--apps/files/js/navigation.js2
-rw-r--r--apps/files/l10n/az.js2
-rw-r--r--apps/files/l10n/az.json2
-rw-r--r--apps/files/l10n/en_GB.js1
-rw-r--r--apps/files/l10n/en_GB.json1
-rw-r--r--apps/files/l10n/fr.js4
-rw-r--r--apps/files/l10n/fr.json4
-rw-r--r--apps/files/l10n/nb_NO.js2
-rw-r--r--apps/files/l10n/nb_NO.json2
-rw-r--r--apps/files/l10n/pt_BR.js1
-rw-r--r--apps/files/l10n/pt_BR.json1
-rw-r--r--apps/files/tests/controller/apicontrollertest.php1
14 files changed, 17 insertions, 10 deletions
diff --git a/apps/files/controller/apicontroller.php b/apps/files/controller/apicontroller.php
index 072265d86d6..0cc222d7ce9 100644
--- a/apps/files/controller/apicontroller.php
+++ b/apps/files/controller/apicontroller.php
@@ -31,7 +31,6 @@ use OCP\AppFramework\Controller;
use OCP\IRequest;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\DataDisplayResponse;
-use OCP\AppFramework\Http\DownloadResponse;
use OCA\Files\Service\TagService;
use OCP\IPreview;
@@ -93,7 +92,6 @@ class ApiController extends Controller {
* replace the actual tag selection.
*
* @NoAdminRequired
- * @CORS
*
* @param string $path path
* @param array|string $tags array of tags
@@ -127,7 +125,6 @@ class ApiController extends Controller {
* Returns a list of all files tagged with the given tag.
*
* @NoAdminRequired
- * @CORS
*
* @param array|string $tagName tag name to filter by
* @return DataResponse
diff --git a/apps/files/index.php b/apps/files/index.php
index ea0fd0ce2fe..c7a45e54854 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -29,7 +29,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
-use OCA\Files\Appinfo\Application;
// Check if we are a user
OCP\User::checkLoggedIn();
diff --git a/apps/files/js/navigation.js b/apps/files/js/navigation.js
index be385f21f50..83cd556c89a 100644
--- a/apps/files/js/navigation.js
+++ b/apps/files/js/navigation.js
@@ -124,7 +124,7 @@
var $target = $(ev.target);
var itemId = $target.closest('li').attr('data-id');
this.setActiveItem(itemId);
- return false;
+ ev.preventDefault();
}
};
diff --git a/apps/files/l10n/az.js b/apps/files/l10n/az.js
index 5665807da8f..3f76fd9a328 100644
--- a/apps/files/l10n/az.js
+++ b/apps/files/l10n/az.js
@@ -42,6 +42,7 @@ OC.L10N.register(
"Delete" : "Sil",
"Disconnect storage" : "Daşıyıcını ayır",
"Unshare" : "Paylaşımı durdur",
+ "No permission to delete" : "Silmək üçün yetki yoxdur",
"Download" : "Yüklə",
"Select" : "Seç",
"Pending" : "Gözləmə",
@@ -70,6 +71,7 @@ OC.L10N.register(
"An error occurred while trying to update the tags" : "Qeydlərin yenilənməsi müddətində səhv baş verdi ",
"A new file or folder has been <strong>created</strong>" : "Yeni fayl və ya direktoriya <strong>yaradılmışdır</strong>",
"A file or folder has been <strong>changed</strong>" : "Fayl və ya direktoriya <strong>dəyişdirilib</strong>",
+ "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "<strong>sevimli faylların</strong> yaradılması və silinməsi haqqında olan xəbərdarlıqları limitlə <em>(Yalnız axınlar)</em>",
"A file or folder has been <strong>deleted</strong>" : "Fayl və ya direktoriya <strong>silinib</strong>",
"A file or folder has been <strong>restored</strong>" : "Fayl yada qovluq geriyə <strong>qaytarıldı</strong>",
"You created %1$s" : "Siz yaratdınız %1$s",
diff --git a/apps/files/l10n/az.json b/apps/files/l10n/az.json
index e3f9b6e49cd..ec7c41a00f9 100644
--- a/apps/files/l10n/az.json
+++ b/apps/files/l10n/az.json
@@ -40,6 +40,7 @@
"Delete" : "Sil",
"Disconnect storage" : "Daşıyıcını ayır",
"Unshare" : "Paylaşımı durdur",
+ "No permission to delete" : "Silmək üçün yetki yoxdur",
"Download" : "Yüklə",
"Select" : "Seç",
"Pending" : "Gözləmə",
@@ -68,6 +69,7 @@
"An error occurred while trying to update the tags" : "Qeydlərin yenilənməsi müddətində səhv baş verdi ",
"A new file or folder has been <strong>created</strong>" : "Yeni fayl və ya direktoriya <strong>yaradılmışdır</strong>",
"A file or folder has been <strong>changed</strong>" : "Fayl və ya direktoriya <strong>dəyişdirilib</strong>",
+ "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "<strong>sevimli faylların</strong> yaradılması və silinməsi haqqında olan xəbərdarlıqları limitlə <em>(Yalnız axınlar)</em>",
"A file or folder has been <strong>deleted</strong>" : "Fayl və ya direktoriya <strong>silinib</strong>",
"A file or folder has been <strong>restored</strong>" : "Fayl yada qovluq geriyə <strong>qaytarıldı</strong>",
"You created %1$s" : "Siz yaratdınız %1$s",
diff --git a/apps/files/l10n/en_GB.js b/apps/files/l10n/en_GB.js
index 80515d6890e..4fa680b5c7f 100644
--- a/apps/files/l10n/en_GB.js
+++ b/apps/files/l10n/en_GB.js
@@ -42,6 +42,7 @@ OC.L10N.register(
"Delete" : "Delete",
"Disconnect storage" : "Disconnect storage",
"Unshare" : "Unshare",
+ "No permission to delete" : "No permission to delete",
"Download" : "Download",
"Select" : "Select",
"Pending" : "Pending",
diff --git a/apps/files/l10n/en_GB.json b/apps/files/l10n/en_GB.json
index e22b24ca829..417272a5cdb 100644
--- a/apps/files/l10n/en_GB.json
+++ b/apps/files/l10n/en_GB.json
@@ -40,6 +40,7 @@
"Delete" : "Delete",
"Disconnect storage" : "Disconnect storage",
"Unshare" : "Unshare",
+ "No permission to delete" : "No permission to delete",
"Download" : "Download",
"Select" : "Select",
"Pending" : "Pending",
diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
index b8f526af5c2..86114d7ddfb 100644
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@@ -16,7 +16,7 @@ OC.L10N.register(
"No file was uploaded. Unknown error" : "Aucun fichier n'a été envoyé. Erreur inconnue",
"There is no error, the file uploaded with success" : "Aucune erreur, le fichier a été envoyé avec succès.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini :",
- "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Le fichier envoyé dépasse la valeur MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.",
+ "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Le fichier envoyé dépasse la valeur MAX_FILE_SIZE qui était spécifiée dans le formulaire HTML.",
"The uploaded file was only partially uploaded" : "Le fichier n'a été que partiellement envoyé.",
"No file was uploaded" : "Pas de fichier envoyé.",
"Missing a temporary folder" : "Absence de dossier temporaire",
@@ -101,7 +101,7 @@ OC.L10N.register(
"Folder" : "Dossier",
"Upload" : "Chargement",
"Cancel upload" : "Annuler l'envoi",
- "No files in here" : "Pas de fichier ici",
+ "No files in here" : "Aucun fichier ici",
"Upload some content or sync with your devices!" : "Déposez du contenu ou synchronisez vos appareils !",
"No entries found in this folder" : "Aucune entrée trouvée dans ce dossier",
"Select all" : "Tout sélectionner",
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
index c177a4e6840..467aa830ce2 100644
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@@ -14,7 +14,7 @@
"No file was uploaded. Unknown error" : "Aucun fichier n'a été envoyé. Erreur inconnue",
"There is no error, the file uploaded with success" : "Aucune erreur, le fichier a été envoyé avec succès.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini :",
- "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Le fichier envoyé dépasse la valeur MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.",
+ "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Le fichier envoyé dépasse la valeur MAX_FILE_SIZE qui était spécifiée dans le formulaire HTML.",
"The uploaded file was only partially uploaded" : "Le fichier n'a été que partiellement envoyé.",
"No file was uploaded" : "Pas de fichier envoyé.",
"Missing a temporary folder" : "Absence de dossier temporaire",
@@ -99,7 +99,7 @@
"Folder" : "Dossier",
"Upload" : "Chargement",
"Cancel upload" : "Annuler l'envoi",
- "No files in here" : "Pas de fichier ici",
+ "No files in here" : "Aucun fichier ici",
"Upload some content or sync with your devices!" : "Déposez du contenu ou synchronisez vos appareils !",
"No entries found in this folder" : "Aucune entrée trouvée dans ce dossier",
"Select all" : "Tout sélectionner",
diff --git a/apps/files/l10n/nb_NO.js b/apps/files/l10n/nb_NO.js
index 56cea9ed363..7e45f374988 100644
--- a/apps/files/l10n/nb_NO.js
+++ b/apps/files/l10n/nb_NO.js
@@ -42,6 +42,7 @@ OC.L10N.register(
"Delete" : "Slett",
"Disconnect storage" : "Koble fra lagring",
"Unshare" : "Avslutt deling",
+ "No permission to delete" : "Ikke tillatelse til å slette",
"Download" : "Last ned",
"Select" : "Velg",
"Pending" : "Ventende",
@@ -70,6 +71,7 @@ OC.L10N.register(
"An error occurred while trying to update the tags" : "En feil oppstod under oppdatering av taggene",
"A new file or folder has been <strong>created</strong>" : "En ny fil eller mappe ble <strong>opprettet</strong>",
"A file or folder has been <strong>changed</strong>" : "En fil eller mappe ble <strong>endret</strong>",
+ "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Begrens varsler om oppretting og endringer i dine <strong>favorittfiler</strong> <em>(Kun strøm)</em>",
"A file or folder has been <strong>deleted</strong>" : "En fil eller mappe ble <strong>slettet</strong>",
"A file or folder has been <strong>restored</strong>" : "En fil eller mappe ble <strong>gjenopprettet</strong>",
"You created %1$s" : "Du opprettet %1$s",
diff --git a/apps/files/l10n/nb_NO.json b/apps/files/l10n/nb_NO.json
index 69db79a6695..4e6779e36c8 100644
--- a/apps/files/l10n/nb_NO.json
+++ b/apps/files/l10n/nb_NO.json
@@ -40,6 +40,7 @@
"Delete" : "Slett",
"Disconnect storage" : "Koble fra lagring",
"Unshare" : "Avslutt deling",
+ "No permission to delete" : "Ikke tillatelse til å slette",
"Download" : "Last ned",
"Select" : "Velg",
"Pending" : "Ventende",
@@ -68,6 +69,7 @@
"An error occurred while trying to update the tags" : "En feil oppstod under oppdatering av taggene",
"A new file or folder has been <strong>created</strong>" : "En ny fil eller mappe ble <strong>opprettet</strong>",
"A file or folder has been <strong>changed</strong>" : "En fil eller mappe ble <strong>endret</strong>",
+ "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Begrens varsler om oppretting og endringer i dine <strong>favorittfiler</strong> <em>(Kun strøm)</em>",
"A file or folder has been <strong>deleted</strong>" : "En fil eller mappe ble <strong>slettet</strong>",
"A file or folder has been <strong>restored</strong>" : "En fil eller mappe ble <strong>gjenopprettet</strong>",
"You created %1$s" : "Du opprettet %1$s",
diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js
index a55e0e88b69..70aafce6827 100644
--- a/apps/files/l10n/pt_BR.js
+++ b/apps/files/l10n/pt_BR.js
@@ -64,6 +64,7 @@ OC.L10N.register(
"File name cannot be empty." : "O nome do arquivo não pode estar vazio.",
"Your storage is full, files can not be updated or synced anymore!" : "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!",
"Your storage is almost full ({usedSpacePercent}%)" : "Seu armazenamento está quase cheio ({usedSpacePercent}%)",
+ "_matches '{filter}'_::_match '{filter}'_" : ["coincide com '{filter}'","coincide com '{filter}'"],
"{dirs} and {files}" : "{dirs} e {files}",
"Favorited" : "Favorito",
"Favorite" : "Favorito",
diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json
index 0129b544ab4..941073fe630 100644
--- a/apps/files/l10n/pt_BR.json
+++ b/apps/files/l10n/pt_BR.json
@@ -62,6 +62,7 @@
"File name cannot be empty." : "O nome do arquivo não pode estar vazio.",
"Your storage is full, files can not be updated or synced anymore!" : "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!",
"Your storage is almost full ({usedSpacePercent}%)" : "Seu armazenamento está quase cheio ({usedSpacePercent}%)",
+ "_matches '{filter}'_::_match '{filter}'_" : ["coincide com '{filter}'","coincide com '{filter}'"],
"{dirs} and {files}" : "{dirs} e {files}",
"Favorited" : "Favorito",
"Favorite" : "Favorito",
diff --git a/apps/files/tests/controller/apicontrollertest.php b/apps/files/tests/controller/apicontrollertest.php
index bbab711310c..0ec38e0e2e7 100644
--- a/apps/files/tests/controller/apicontrollertest.php
+++ b/apps/files/tests/controller/apicontrollertest.php
@@ -25,7 +25,6 @@ namespace OCA\Files\Controller;
use OC\Files\FileInfo;
use OCP\AppFramework\Http;
-use OC\Preview;
use OCP\Files\NotFoundException;
use OCP\Files\StorageNotAvailableException;
use Test\TestCase;