Commit Graph

154 Commits

Author SHA1 Message Date
Timofey Boyko
93d1675bfb Fixed Bug 61190 - Files. The editor does not open + errors in the console if the username contains XSS injection 2023-02-15 12:16:11 +03:00
c89b8ca427 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
#	common/ASC.Data.Backup.Core/Storage/BackupStorageFactory.cs
#	common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
#	common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
2023-02-07 14:31:22 +03:00
Timofey Boyko
131dd06bdb Web: fix build 2023-02-06 19:15:04 +03:00
Timofey Boyko
6137e2a122 Web: remove before-build-webpack-plugin and apply custom plugin for create autoGeneratedTranlsations files 2023-02-06 11:32:02 +03:00
Timofey Boyko
f29d92f745 Web:Editor: add autoGeneratedTranslations.ts to gitignore file 2023-02-03 19:09:36 +03:00
Timofey Boyko
0b7b214fbb Web: change prebuild-webpack-plugin for before-build-webpack-plugin 2023-02-03 18:52:51 +03:00
Timofey Boyko
81dbf9c840 Web:Editor: update work with translation files 2023-02-03 17:49:28 +03:00
Timofey Boyko
7d1aa41ebb Web:Editor: add new alias, add additionalPath at beforeBuild function and remove file loader for json file for server 2023-02-03 17:48:59 +03:00
961b0ad613 Merge branch 'release/rc-v1.2.0' into feature/fonts-static-versioned 2023-02-02 17:46:41 +03:00
Timofey Boyko
9f0d2b62cb Web: fix regexp for json locales 2023-02-02 17:09:26 +03:00
de95953b14 Web: Fix OS path separator split 2023-02-02 16:50:45 +03:00
Timofey Boyko
2f532533de Web:Editor: delete useless code 2023-02-02 15:16:58 +03:00
Timofey Boyko
70f319160c Web:Editor: add asset/resource type for woff2 format and disable emit files, also change asset path 2023-02-02 15:16:31 +03:00
Timofey Boyko
779cd5f4c8 Web: update regexp for webpack for work with locales files as url 2023-02-01 18:49:17 +03:00
Timofey Boyko
0c63349dd1 Web:Editor: fix multi create auto generated translations file 2023-02-01 18:43:12 +03:00
Timofey Boyko
57d6925791 Web: update webpack configs for work with auto generated translations file 2023-02-01 18:36:43 +03:00
Timofey Boyko
72e3fe9032 Web: rename translations to autoGeneratedTranslations 2023-02-01 17:53:33 +03:00
Timofey Boyko
b717ce6f30 Web:Editor:Webpack: delete console.log 2023-02-01 16:13:37 +03:00
Timofey Boyko
2b2b8377c7 Web: add beforeBuild to all modules 2023-02-01 16:06:33 +03:00
Timofey Boyko
581d81a347 Web:Editor: add prebuild-webpack-plugin 2023-02-01 16:03:42 +03:00
Timofey Boyko
ac032a29c3 Web:Editor: fix path for server 2023-02-01 12:08:24 +03:00
Timofey Boyko
9a5171a72d Web:Editor:Helpers: fix loadLanguagePath and initI18n functions for work with static locales 2023-02-01 11:29:36 +03:00
Timofey Boyko
2bfb6ef7b0 Web:Editor: return Common locales import 2023-02-01 11:28:36 +03:00
Timofey Boyko
3048f56b19 Web:Editor: disable copy file with file-loader and return copy-webpack-plugin for locales 2023-02-01 11:26:58 +03:00
Timofey Boyko
ce06b2984e Web:Editor: fix work with hashed translation 2023-01-31 19:23:49 +03:00
Timofey Boyko
71c14db6df Revert 6bbf8e3a62 2023-01-31 18:56:58 +03:00
Timofey Boyko
521a1658c6 Web:Editor: disable sw and fix tranlsation hash 2023-01-31 17:10:19 +03:00
Timofey Boyko
2002564c1a Web:Editor: update webpack config for work with json files as url 2023-01-30 19:18:31 +03:00
Timofey Boyko
6bbf8e3a62 Web: move all Locales from Login and Editor to public dir 2023-01-30 15:11:30 +03:00
Timofey Boyko
064c7b593d Web:Editor: fix PUBLIC_DIR 2023-01-27 17:07:56 +03:00
Timofey Boyko
46fd0401c8 Web:Editor: add PUBLIC_DIR alias 2023-01-27 16:27:39 +03:00
Timofey Boyko
ab7e49b93e Merge branch 'release/rc-v1.2.0' into bugfix/images-static-versioned 2023-01-27 16:01:11 +03:00
Timofey Boyko
046df1e16e Web:Editor:Server: disable cache-control 2023-01-27 13:53:13 +03:00
7db5e5f353 Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal 2023-01-27 12:11:11 +03:00
Timofey Boyko
76bd31350f Merge branch 'release/rc-v1.2.0' into bugfix/images-static-versioned 2023-01-27 11:42:52 +03:00
761a8357dd Fix Bug 60788 - Rooms.Search. The background scrolls behind the List accounts panel on the touchpad in Chrome on MacOS. 2023-01-26 20:23:50 +03:00
Timofey Boyko
c87c82a6ea Web:Editor: change 'client/' to '/docedtor/' to images 2023-01-26 18:12:08 +03:00
Timofey Boyko
8c71569d04 Web:Editor: change webpack asset rule 2023-01-26 18:11:45 +03:00
05b8f4ea81 Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal 2023-01-25 10:37:37 +03:00
9b6c0f9003 Editor: Added check for config.editorConfig.customization.customer 2023-01-24 22:27:05 +03:00
d2bd062b2f Editor: Added console error logging 2023-01-24 20:57:23 +03:00
75ef9b68f3 Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal 2023-01-24 18:36:09 +03:00
Timofey Boyko
b560fe18a6 Web:Editor: delete console log 2023-01-24 18:24:14 +03:00
Timofey Boyko
ce38924f18 Web:Editor: fix hash url at template 2023-01-24 18:22:55 +03:00
Timofey Boyko
9e5f76d7c0 Web: fix double slash for favicon 2023-01-24 17:37:18 +03:00
31fd0c4acf Web: Editor: Added text when restoring the portal from a backup. 2023-01-24 17:01:09 +03:00
ffe96b00b6 Web: Editor: Deny editing rights when portal restoring. 2023-01-24 11:02:46 +03:00
55d4b19542 Fix open editor error page 2023-01-19 17:55:12 +03:00
Timofey Boyko
f20a1db341 Merge branch 'release/rc-v1.2.0' into branch feature/static-versioned 2023-01-19 16:15:19 +03:00
4f75a19927 Web: Editor: Returned logoUrls. 2023-01-19 15:57:55 +03:00