Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
This commit is contained in:
commit
74d6b4bfd6
@ -1,3 +1,7 @@
|
|||||||
{
|
{
|
||||||
"Uploads": "Hochgeladene Dateien"
|
"Uploads": "Hochgeladene Dateien",
|
||||||
|
"EnterPassword": "Kennwort eingeben",
|
||||||
|
"HideInput": "Ausblenden",
|
||||||
|
"Ready": "Fertig",
|
||||||
|
"UploadAndConvert": "Dateien hochladen und konvertieren"
|
||||||
}
|
}
|
@ -1,3 +1,7 @@
|
|||||||
{
|
{
|
||||||
"Uploads": "Cargas"
|
"Uploads": "Cargas",
|
||||||
|
"EnterPassword": "Introduzca Contraseña",
|
||||||
|
"HideInput": "Ocultar",
|
||||||
|
"Ready": "Listo",
|
||||||
|
"UploadAndConvert": "Cargar y convertir archivos"
|
||||||
}
|
}
|
@ -1,3 +1,7 @@
|
|||||||
{
|
{
|
||||||
"Uploads": "Téléchargements"
|
"Uploads": "Téléchargements",
|
||||||
|
"EnterPassword": "Entrer le mot de passe",
|
||||||
|
"HideInput": "Masquer",
|
||||||
|
"Ready": "Effectué",
|
||||||
|
"UploadAndConvert": "Télécharger et convertir les fichiers"
|
||||||
}
|
}
|
@ -1,3 +1,7 @@
|
|||||||
{
|
{
|
||||||
"Uploads": "Caricati"
|
"Uploads": "Caricati",
|
||||||
|
"EnterPassword": "Inserisci la Password",
|
||||||
|
"HideInput": "Nascondere",
|
||||||
|
"Ready": "Fatto",
|
||||||
|
"UploadAndConvert": "Caricare e convertire file"
|
||||||
}
|
}
|
@ -1,3 +1,7 @@
|
|||||||
{
|
{
|
||||||
"Uploads": "アップロード"
|
"Uploads": "アップロード",
|
||||||
|
"EnterPassword": "パスワードをご入力ください",
|
||||||
|
"HideInput": "隠す",
|
||||||
|
"Ready": "完了",
|
||||||
|
"UploadAndConvert": "ファイルをアップロードして、変換する"
|
||||||
}
|
}
|
@ -1,3 +1,7 @@
|
|||||||
{
|
{
|
||||||
"Uploads": "Încărcări"
|
"Uploads": "Încărcări",
|
||||||
|
"EnterPassword": "Introduceți parola",
|
||||||
|
"HideInput": "Ascunde",
|
||||||
|
"Ready": "Gata",
|
||||||
|
"UploadAndConvert": "Încărcare și convertire fișiere"
|
||||||
}
|
}
|
@ -1,3 +1,7 @@
|
|||||||
{
|
{
|
||||||
"Uploads": "上传"
|
"Uploads": "上传",
|
||||||
|
"EnterPassword": "输入密码",
|
||||||
|
"HideInput": "隐藏",
|
||||||
|
"Ready": "完成",
|
||||||
|
"UploadAndConvert": "上传并转换文件"
|
||||||
}
|
}
|
@ -281,6 +281,7 @@ class FilesStore {
|
|||||||
|
|
||||||
setFiles = (files) => {
|
setFiles = (files) => {
|
||||||
const { socketHelper } = this.settingsStore;
|
const { socketHelper } = this.settingsStore;
|
||||||
|
if (files.length === 0 && this.files.length === 0) return;
|
||||||
|
|
||||||
if (this.files?.length > 0) {
|
if (this.files?.length > 0) {
|
||||||
socketHelper.emit({
|
socketHelper.emit({
|
||||||
@ -300,6 +301,7 @@ class FilesStore {
|
|||||||
};
|
};
|
||||||
|
|
||||||
setFolders = (folders) => {
|
setFolders = (folders) => {
|
||||||
|
if (folders.length === 0 && this.folders.length === 0) return;
|
||||||
this.folders = folders;
|
this.folders = folders;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -892,7 +894,7 @@ class FilesStore {
|
|||||||
!(
|
!(
|
||||||
isRecentFolder ||
|
isRecentFolder ||
|
||||||
isFavoritesFolder ||
|
isFavoritesFolder ||
|
||||||
(isMyFolder && (this.filter.filterType || this.filter.search))
|
(isMyFolder && (this.filterType || this.filterSearch))
|
||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
fileOptions = this.removeOptions(fileOptions, ["open-location"]);
|
fileOptions = this.removeOptions(fileOptions, ["open-location"]);
|
||||||
@ -1104,10 +1106,6 @@ class FilesStore {
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(isMyFolder && (this.filter.filterType || this.filter.search))) {
|
|
||||||
folderOptions = this.removeOptions(folderOptions, ["open-location"]);
|
|
||||||
}
|
|
||||||
|
|
||||||
return folderOptions;
|
return folderOptions;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -1184,13 +1182,8 @@ class FilesStore {
|
|||||||
|
|
||||||
canShareOwnerChange = (item) => {
|
canShareOwnerChange = (item) => {
|
||||||
const userId = this.userStore.user && this.userStore.user.id;
|
const userId = this.userStore.user && this.userStore.user.id;
|
||||||
const isCommonFolder =
|
|
||||||
this.treeFoldersStore.commonFolder &&
|
|
||||||
this.selectedFolderStore.pathParts &&
|
|
||||||
this.treeFoldersStore.commonFolder.id ===
|
|
||||||
this.selectedFolderStore.pathParts[0];
|
|
||||||
|
|
||||||
if (item.providerKey || !isCommonFolder) {
|
if (item.providerKey || !this.hasCommonFolder) {
|
||||||
return false;
|
return false;
|
||||||
} else if (this.authStore.isAdmin) {
|
} else if (this.authStore.isAdmin) {
|
||||||
return true;
|
return true;
|
||||||
@ -1267,6 +1260,15 @@ class FilesStore {
|
|||||||
return this.isHeaderVisible && this.selection.length === items.length;
|
return this.isHeaderVisible && this.selection.length === items.length;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get hasCommonFolder() {
|
||||||
|
return (
|
||||||
|
this.treeFoldersStore.commonFolder &&
|
||||||
|
this.selectedFolderStore.pathParts &&
|
||||||
|
this.treeFoldersStore.commonFolder.id ===
|
||||||
|
this.selectedFolderStore.pathParts[0]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
setFirsElemChecked = (checked) => {
|
setFirsElemChecked = (checked) => {
|
||||||
this.firstElemChecked = checked;
|
this.firstElemChecked = checked;
|
||||||
};
|
};
|
||||||
@ -1313,6 +1315,14 @@ class FilesStore {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
get filterType() {
|
||||||
|
return this.filter.filterType;
|
||||||
|
}
|
||||||
|
|
||||||
|
get filterSearch() {
|
||||||
|
return this.filter.search;
|
||||||
|
}
|
||||||
|
|
||||||
get filesList() {
|
get filesList() {
|
||||||
const { mediaViewersFormatsStore, iconFormatsStore } = this.formatsStore;
|
const { mediaViewersFormatsStore, iconFormatsStore } = this.formatsStore;
|
||||||
const { getIcon } = iconFormatsStore;
|
const { getIcon } = iconFormatsStore;
|
||||||
|
@ -23,8 +23,11 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace ASC.Files.Core.Security
|
namespace ASC.Files.Core.Security
|
||||||
{
|
{
|
||||||
|
[JsonConverter(typeof(JsonStringEnumConverter))]
|
||||||
public enum FileShare
|
public enum FileShare
|
||||||
{
|
{
|
||||||
None,
|
None,
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 2bb4d878b42e8c648dd44fed7d445163772551fa
|
Subproject commit b9a3b81a255ccaa6f174e7ad2dd3bf4d4911aa8f
|
@ -693,6 +693,7 @@ namespace ASC.Files.Helpers
|
|||||||
var aceCollection = new AceCollection<T>
|
var aceCollection = new AceCollection<T>
|
||||||
{
|
{
|
||||||
Files = new List<T> { fileId },
|
Files = new List<T> { fileId },
|
||||||
|
Folders = new List<T>(0),
|
||||||
Aces = list
|
Aces = list
|
||||||
};
|
};
|
||||||
FileStorageService.SetAceObject(aceCollection, false);
|
FileStorageService.SetAceObject(aceCollection, false);
|
||||||
|
5
web/ASC.Web.Client/public/locales/de/Home.json
Normal file
5
web/ASC.Web.Client/public/locales/de/Home.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"GoodMorning": "Guten Morgeng, {{displayName}}!",
|
||||||
|
"GoodAfternoon": "Guten Tag, {{displayName}}!",
|
||||||
|
"GoodEvening": "Guten Abend, {{displayName}}!"
|
||||||
|
}
|
5
web/ASC.Web.Client/public/locales/es/Home.json
Normal file
5
web/ASC.Web.Client/public/locales/es/Home.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"GoodMorning": "¡Buenos días, {{displayName}}!",
|
||||||
|
"GoodAfternoon": "¡Buenas tardes, {{displayName}}!",
|
||||||
|
"GoodEvening": "¡Buenas noches, {{displayName}}!"
|
||||||
|
}
|
5
web/ASC.Web.Client/public/locales/fr/Home.json
Normal file
5
web/ASC.Web.Client/public/locales/fr/Home.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"GoodMorning": "Bonjour, {{displayName}}!",
|
||||||
|
"GoodAfternoon": "Bon après-midi, {{displayName}}!",
|
||||||
|
"GoodEvening": "Bonsoir, {{displayName}}!"
|
||||||
|
}
|
5
web/ASC.Web.Client/public/locales/it/Home.json
Normal file
5
web/ASC.Web.Client/public/locales/it/Home.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"GoodMorning": "Buongiorno, {{displayName}}!",
|
||||||
|
"GoodAfternoon": "Buon pomeriggio, {{displayName}}!",
|
||||||
|
"GoodEvening": "Buonasera, {{displayName}}!"
|
||||||
|
}
|
5
web/ASC.Web.Client/public/locales/ja/Home.json
Normal file
5
web/ASC.Web.Client/public/locales/ja/Home.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"GoodMorning": "{{displayName}}!さん、おはようございます",
|
||||||
|
"GoodAfternoon": "こんにちは{{displayName}}!さん",
|
||||||
|
"GoodEvening": "こんばんは{{displayName}}!さん"
|
||||||
|
}
|
5
web/ASC.Web.Client/public/locales/ro/Home.json
Normal file
5
web/ASC.Web.Client/public/locales/ro/Home.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"GoodMorning": "Bună dimineața, {{displayName}}!",
|
||||||
|
"GoodAfternoon": "Bună ziua, {{displayName}}!",
|
||||||
|
"GoodEvening": "Bună seara, {{displayName}}!"
|
||||||
|
}
|
5
web/ASC.Web.Client/public/locales/zh-CN/Home.json
Normal file
5
web/ASC.Web.Client/public/locales/zh-CN/Home.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"GoodMorning": "早上好, {{displayName}}!",
|
||||||
|
"GoodAfternoon": "下午好, {{displayName}}!",
|
||||||
|
"GoodEvening": "晚上好, {{displayName}}!"
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user