Commit Graph

8384 Commits

Author SHA1 Message Date
d9a8fd58ba Web: Backup: Added max length to the text. 2022-02-25 12:05:43 +03:00
47faaf1653 Web: Backup: Added description of modules. 2022-02-25 11:54:21 +03:00
a5a72e3e9d Web: Backup: Changed styles. 2022-02-25 11:38:07 +03:00
2eeed99efa Web: Client: Main: Removed --vh parameter from global styles for non IOS devices 2022-02-25 11:28:23 +03:00
56caa47575 Web: Backup: Added desktop view. 2022-02-25 10:46:14 +03:00
Artem Tarasov
37eb0732a9 Web: Doceditor: modified sharedDependencies 2022-02-24 17:43:46 +03:00
d40d73a3a5 GoogleAuth: fix 94 issue 2022-02-24 17:36:44 +03:00
32d73f902e Web: Restore: Rename folder. 2022-02-24 10:03:24 +03:00
c0a1f20984 Web: ManualBackup: Rename folder. 2022-02-24 09:46:39 +03:00
ac595bb1e5 Web: Auto: Rename folder. 2022-02-24 09:44:59 +03:00
dd183de11d Web: Moved files to separate folder. 2022-02-24 09:35:27 +03:00
bbb01a96d1 WEb: Files: Restore: Fixed page fall. 2022-02-24 09:02:53 +03:00
3d4e000778 Merge branch 'develop' into feature/async
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
2022-02-23 16:01:55 +03:00
27254146ae Web: Files: Restore: Added new loader. 2022-02-22 15:38:36 +03:00
Artem Tarasov
73a0c6b637 Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Home/index.js
#	web/ASC.Web.Editor/src/App.js
#	yarn.lock
2022-02-22 13:00:33 +03:00
Artem Tarasov
64a7b0cb17 Web: Doceditor: modified template, package.json 2022-02-22 12:48:16 +03:00
85d6f3541e Web: Files: Changed styles for empty backup list. 2022-02-22 12:37:16 +03:00
c29d35c36d Web: Files: Added possibility to delete backup elem without selected file. 2022-02-22 12:30:30 +03:00
a797b3490e Files: async fixes 2022-02-22 12:22:15 +03:00
Artem Tarasov
5bf3c8bc2c Web: Doceditor: modified config' 2022-02-22 11:43:05 +03:00
3aeac42444 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Data/DbSubscriptionService.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
#	common/services/ASC.ElasticSearch/Service/Settings.cs
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
#	common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	packages/asc-web-components/table-container/TableRow.js
#	products/ASC.Files/Client/public/locales/az/Home.json
#	products/ASC.Files/Client/public/locales/bg/Home.json
#	products/ASC.Files/Client/public/locales/bg/Translations.json
#	products/ASC.Files/Client/public/locales/cs/Home.json
#	products/ASC.Files/Client/public/locales/de/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/de/Home.json
#	products/ASC.Files/Client/public/locales/de/Translations.json
#	products/ASC.Files/Client/public/locales/de/UploadPanel.json
#	products/ASC.Files/Client/public/locales/el/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/el/Home.json
#	products/ASC.Files/Client/public/locales/en/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/en/Home.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/en/UploadPanel.json
#	products/ASC.Files/Client/public/locales/es/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/es/Home.json
#	products/ASC.Files/Client/public/locales/es/UploadPanel.json
#	products/ASC.Files/Client/public/locales/fi/Home.json
#	products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/fr/Home.json
#	products/ASC.Files/Client/public/locales/fr/Translations.json
#	products/ASC.Files/Client/public/locales/it/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/it/Home.json
#	products/ASC.Files/Client/public/locales/it/Translations.json
#	products/ASC.Files/Client/public/locales/it/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ja/Home.json
#	products/ASC.Files/Client/public/locales/ja/UploadPanel.json
#	products/ASC.Files/Client/public/locales/lv/Home.json
#	products/ASC.Files/Client/public/locales/nl/Home.json
#	products/ASC.Files/Client/public/locales/nl/Translations.json
#	products/ASC.Files/Client/public/locales/pl/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/pt-BR/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/Translations.json
#	products/ASC.Files/Client/public/locales/ro/Home.json
#	products/ASC.Files/Client/public/locales/ro/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/ru/Home.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/public/locales/ru/UploadPanel.json
#	products/ASC.Files/Client/public/locales/sk/Home.json
#	products/ASC.Files/Client/public/locales/tr/Home.json
#	products/ASC.Files/Client/public/locales/uk/Home.json
#	products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/vi/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
#	products/ASC.Files/Client/src/HOCs/withBadges.js
#	products/ASC.Files/Client/src/HOCs/withContent.js
#	products/ASC.Files/Client/src/components/Badges.js
#	products/ASC.Files/Client/src/components/EditingWrapperComponent.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	public/locales/de/Common.json
2022-02-21 22:22:38 +03:00
d09776db37 Web: Files: The logic of the dialog with the list of backups has been changed, redesign. 2022-02-21 17:21:50 +03:00
Artem Tarasov
a72302961d Web: Doceditor: modified server config 2022-02-19 01:50:14 +03:00
41b5a1dcd1 Web: Files: Hidden elements of NavMenu, disabled click on logo. 2022-02-18 10:54:53 +03:00
Artem Tarasov
a00a616d9b Web: Doceditor: added config for styled-components (ssr) 2022-02-17 17:18:51 +03:00
ecb5c7fba2 Fixed Bug 55614 - Client.ExternalLink. ‘404 Not Found’ when opening an external link. 2022-02-17 15:12:54 +03:00
4255cec9ad Notify: fix unsubscribe url 2022-02-17 11:30:37 +03:00
bef7c923db Settings: added method to get current subscription state 2022-02-16 19:32:42 +03:00
Artem Tarasov
88b6c22ff4 Web: Doceditor: added webpack-merge 2022-02-16 18:34:01 +03:00
Vashchuk Nikita
0a384b2c28 refactoring async methods 2022-02-16 15:57:37 +03:00
Artem Tarasov
e90fbf2bfc Web: Doceditro: config fix 2022-02-16 14:16:27 +03:00
Viktor Fomin
fb8e0748f6
Web: Campaigns: add ads examples 2022-02-16 14:11:49 +03:00
Artem Tarasov
0853e487f8 Web: Doceditor: added client render 2022-02-16 13:04:04 +03:00
Artem Tarasov
fe8aefd2e4 Web: Doceditor: fixed import in render.js 2022-02-16 12:52:17 +03:00
Artem Tarasov
f92d2dd2c5 Web: Doceditor: added server render 2022-02-16 12:50:32 +03:00
Artem Tarasov
14490e8496 Web: Doceditor: added initDocEditor func 2022-02-16 12:46:47 +03:00
Artem Tarasov
260d00202c Web: Editor: Components: added dynamic component 2022-02-16 12:44:25 +03:00
Artem Tarasov
b0e5f7e335 Web: Doceditor: added Editor.js 2022-02-16 12:41:12 +03:00
Artem Tarasov
da51dfdd2e Web: Doceditor: added node app 2022-02-16 12:34:37 +03:00
Artem Tarasov
89a3b3443d Web: Doceditor: package.json: modified scripts 2022-02-16 11:37:47 +03:00
f978cb657d Web: files: AutoBackup: Optimization saving process. 2022-02-16 11:24:12 +03:00
Artem Tarasov
8fb05dbc56 Web: Doceditor: modified .babelrc 2022-02-16 11:23:37 +03:00
Artem Tarasov
ffc5630958 Web: Doceditor: added simple webpack config 2022-02-16 11:21:42 +03:00
Artem Tarasov
a94022816f Web: Doceditor: added express, modified yarn.lock 2022-02-16 11:20:33 +03:00
b5ebbef616 Web: files: AutoBackup: Delete useless code. 2022-02-16 10:11:08 +03:00
Artem Tarasov
04667e6821 Web: Doceditor: removed next.js 2022-02-15 18:44:10 +03:00
879a027055 Web: Files: AutoBackup: Optimization modules. 2022-02-15 18:22:55 +03:00
7f4d29da03 Web: Editor: fixed canConvert 2022-02-15 16:57:32 +03:00
Vashchuk Nikita
b17119b711 refactoring async methods 2022-02-15 16:20:06 +03:00
af51658493 Web: Campaigns: init example 2022-02-15 13:09:44 +03:00
f26eb17fe1 Web: Common: move shell changes from hotfix/campaigns banner 2022-02-15 11:37:31 +03:00
853d2280b6 Web: Files: RestoreBackup: Hidden elements of header. 2022-02-15 09:24:44 +03:00
4a6ad133b0 Web: files: Changed styles for preparation portal. 2022-02-14 17:46:27 +03:00
6ba390ea62 Web: Files: AutoBackup: optimization, refactoring. 2022-02-14 17:06:26 +03:00
Vashchuk Nikita
631dcdc2e8 Merge branch 'develop' into feature/async
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
#	common/ASC.Data.Storage/CrossModuleTransferUtility.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/Extensions.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Data.Storage/StorageHandler.cs
#	common/services/ASC.ApiSystem/Controllers/PortalController.cs
#	products/ASC.CRM/Server/Api/VoipController.cs
#	products/ASC.CRM/Server/Core/Dao/RelationshipEventDao.cs
#	products/ASC.CRM/Server/Utils/PdfCreator.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/SearchHandler.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/MailMergeTask.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	web/ASC.Web.Core/Files/DocumentService.cs
#	web/ASC.Web.Core/Files/DocumentServiceLicense.cs
#	web/ASC.Web.Core/Helpers/ApiSystemHelper.cs
#	web/ASC.Web.Core/Recaptcha.cs
#	web/ASC.Web.Core/Utility/UrlShortener.cs
2022-02-12 00:51:48 +03:00
Vashchuk Nikita
7164c54b44 fix 2022-02-10 21:25:40 +03:00
099d7049e3 Web: files: Fixed enabling of auto backup/restore. 2022-02-10 18:17:34 +03:00
6ee61695be Web: files: added start restore. 2022-02-10 13:16:46 +03:00
Artem Tarasov
56758b5850 Web: Doceditor: fixed i18n config 2022-02-09 19:39:04 +03:00
0069c6e7d4 Web: Files: RestoreBackup: Fixed timer. 2022-02-09 18:30:36 +03:00
ddd2e7182f Web: Files: Backup: Added method to check if automatic backup is available, refactoring. 2022-02-09 18:16:07 +03:00
f8a748aae3 Web: files: Code simplification. 2022-02-09 17:25:40 +03:00
e8c2ce8294 Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup 2022-02-09 15:29:14 +03:00
a7337f6580 Web: Files: ManualBackup: Optimization, refactoring. 2022-02-09 15:08:48 +03:00
d429bcc731 Merge branch 'develop' into feature/backup 2022-02-09 12:40:16 +03:00
783d5bd95e Web: files: restoreBackup: Optimization. 2022-02-08 17:53:17 +03:00
Artem Tarasov
acb5701ee4 Web: Doceditor: applied i18n 2022-02-08 17:44:34 +03:00
Artem Tarasov
f7c4cf334d Web: Doceditor: added config i18n 2022-02-08 17:43:59 +03:00
74d6b4bfd6 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-08 16:06:34 +03:00
8d6818c6cd Web: Client: fixed header-logo-wrapper styles 2022-02-08 16:06:25 +03:00
0dbf561def Web: Files: AutoBackup: changed schedule styles. 2022-02-08 11:11:08 +03:00
0c73b7f366 Web: Files: AutoBackup: Changed styles. 2022-02-08 11:06:53 +03:00
7d4069a559 WEb: files: ManualBackup: Changed styles. 2022-02-08 10:52:00 +03:00
d2dfac2ed3 Web: RestoreBackup: Changed styles. 2022-02-08 10:32:20 +03:00
Artem Tarasov
39c2fabb69 Web: Doceditor: fixed page title and icon change 2022-02-08 02:25:10 +03:00
Artem Tarasov
43f882ee32 Web: DocEditor: index.js location changed, added Loader 2022-02-08 01:49:48 +03:00
Artem Tarasov
51e8212eb9 Web: DocEditor/nginx: added base path for doceditor 2022-02-08 01:48:41 +03:00
Artem Tarasov
331a53fbed Web: Dooceditor: added redirect to login page if user is not logged in 2022-02-07 23:11:15 +03:00
b2079ccace fixed warnings 2022-02-07 20:19:58 +03:00
9f5a1f3ba7 Merge branch 'develop' into feature/analizators 2022-02-07 19:28:23 +03:00
812241a69a Analyzers: fix 2022-02-07 17:53:58 +03:00
87b0931f54 Web: Files: RestoreBackup: Refactoring. 2022-02-07 17:27:07 +03:00
33c0e49705 add new file (Home) (de, es, fr, it, zh-CN, ro), update ja UploadPanel 2022-02-07 16:44:59 +03:00
0f714ebd15 WEb: Files: RestoreBackup: Added logic for third party storage. 2022-02-07 16:37:05 +03:00
b47e1f0215 Web: files: Fixed upload method. 2022-02-07 13:22:19 +03:00
a3ffeadafe Web: Files: Added upload method. 2022-02-07 13:02:35 +03:00
40d56075f1 Merge branch 'develop' into feature/backup
# Conflicts:
#	common/ASC.Data.Backup.Core/EF/BackupsContext.cs
#	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
#	common/services/ASC.Data.Backup/Controllers/BackupController.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
#	products/ASC.Files/Client/public/locales/en/OperationsPanel.json
#	products/ASC.Files/Client/public/locales/en/Settings.json
#	products/ASC.Files/Client/public/locales/ru/Settings.json
#	products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/webpack.config.js
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/webpack.config.js
2022-02-07 12:40:50 +03:00
6b89f94fbb Web: files: ManualBackup: Refactoring. 2022-02-06 20:15:27 +03:00
80dafc0815 Web: files: RestoreBackup: Refactoring. 2022-02-06 19:42:40 +03:00
988248fbfb Web: Files: AutoBackup: Refactoring modules. 2022-02-06 17:09:08 +03:00
f12949409c Web: files: AutoBackup: fixed radio button. 2022-02-06 17:08:29 +03:00
2f0677a532 Web: files: AutoBackup: Refactoring. 2022-02-06 16:36:45 +03:00
e16d75839a Merge branch 'develop' of github.com:ONLYOFFICE/CommunityServer-AspNetCore into develop 2022-02-04 21:00:05 +03:00
eed733b83c fixed user photo thumbnail generator 2022-02-04 20:59:58 +03:00
Artem Tarasov
d142d16c4a Web: Doceditor: applied initSSR for axiosClient 2022-02-04 17:00:15 +03:00
Vashchuk Nikita
5aa99ec811 Merge branch 'develop' into feature/async
# Conflicts:
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/services/ASC.AuditTrail/AuditEventsRepository.cs
#	common/services/ASC.AuditTrail/LoginEventsRepository.cs
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Utils/MailMergeTask.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
2022-02-04 16:04:52 +03:00
6ca6233125 Web: Files: AutoBackup: Deleted unnecessary request. 2022-02-04 13:40:22 +03:00
914c4d18af Web: files: AutoBackup: Moved reset module settings to separate function. 2022-02-04 13:38:15 +03:00
1fdb2b5d59 WEb: files: AutoBackup: Fix initial hour. 2022-02-04 13:32:02 +03:00
99ab37608d Web: Files: Fixed incorrect saving of the day of the week, refactoring. 2022-02-04 12:50:16 +03:00
077e81227e Web: files: AutoBackup: Refactoring, reset period settings moved to a separate function. 2022-02-04 11:55:13 +03:00
731cbc649b
Merge pull request #500 from ONLYOFFICE/feature/socket-io
Feature/socket io
2022-02-03 20:58:18 +03:00
0f76ba3613 Fixed Bug 55236 - Editor: File from third-party storage is can added to favorites. 2022-02-03 17:49:00 +03:00
bd8d980f6c Web: Files: Fixed manual backup. 2022-02-03 16:12:12 +03:00
92ee0db2f3 Web: Files: Refactoring manual backup. 2022-02-03 15:21:12 +03:00
34dab043e0 Merge branch 'develop' into feature/analizators
# Conflicts:
#	common/ASC.Core.Common/ASC.Core.Common.csproj
2022-02-03 12:55:33 +03:00
4661ee96d0 Packages updated 2022-02-02 19:54:23 +03:00
d0bb0c18a6 Web: Files: Fixed editing of converted file. 2022-02-02 19:32:38 +03:00
Artem Tarasov
275a490545 Merge branch 'develop' into feature/doceditor-ssr 2022-02-02 19:26:51 +03:00
Artem Tarasov
9d6918170f Web: Doceditor: fix dependencies fix 2022-02-02 19:20:34 +03:00
Artem Tarasov
bca026544c Web: Doceditor: moved initialization on the server side 2022-02-02 19:15:21 +03:00
Artem Tarasov
f35e24c4e8 Web: Doceditor: added _error.js 2022-02-02 19:13:39 +03:00
Artem Tarasov
3fe03c4a29 Web: Doceditor: renamed webpack.config.js to webpack.config-csr.js 2022-02-02 19:11:59 +03:00
6750931fe9 Web: Files: Added error handler for request edit rights function. 2022-02-02 18:29:00 +03:00
Artem Tarasov
a04235b260 Web: Common/Studio: moved tryRedirectTo() to separate file (ssr crash) 2022-02-02 18:28:29 +03:00
76eead7708 Web: Files: Fixed editing of shared form. 2022-02-02 18:16:52 +03:00
Vashchuk Nikita
2901d837a1 async methods for httpClient in ASC.Web 2022-01-31 17:35:36 +03:00
47d43fbcfb WebL Editor: Removed commented code 2022-01-31 15:16:31 +03:00
17cb4a647b analizators: bugfix 2022-01-31 14:35:59 +03:00
34ff334692 Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03:00
Artem Tarasov
1d0bd0bf8b Web: Doceditor: change remoteApiUrl 2022-01-28 13:52:20 +03:00
Artem Tarasov
1e6d2f1e1c Web: Editor: added global styles 2022-01-28 13:51:23 +03:00
Artem Tarasov
7f3878afc5 Web: Doceditor: created route product/files/doceditor. removed [...slug].js page 2022-01-28 13:50:09 +03:00
Artem Tarasov
9e32295fae Web: Editor: added [...slug].js (index.page) 2022-01-27 16:54:40 +03:00
Artem Tarasov
96f15bc2a3 Web: Editor: added _app.js and _document.js (styled-components for ssr) 2022-01-27 16:53:41 +03:00
Artem Tarasov
8674d500ae Web: Editor: added nextjs config 2022-01-27 16:46:41 +03:00
Artem Tarasov
1ec56b19de Web: Editor: added nextjs 2022-01-27 16:45:36 +03:00
1908af64f0 cache: return support kafka. refactoring 2022-01-27 15:20:51 +03:00
Vashchuk Nikita
3e03f820bb async IDataStore 2022-01-25 12:29:11 +03:00
445f03097d Fix content-type header 2022-01-24 22:44:18 +03:00
eb75b0b32a Web: Files: Added opportunity to react on modify-folder with socket 2022-01-24 20:43:24 +03:00
b25f339c3e Merge branch 'hotfix/v1.1.1' into feature/socket-io 2022-01-24 15:43:04 +03:00
fce8d26cef analizators/ca1507 2022-01-24 13:49:00 +03:00
fb3a61d0d2 analizators/s3442 2022-01-24 12:57:01 +03:00
667697f933 analizators/s2259 2022-01-21 16:46:30 +03:00
510bd4d731 analizators/s2219 2022-01-21 16:42:02 +03:00
f3d8b8d17a analizators/s1854 2022-01-21 16:36:36 +03:00
2f5a70e6ef analizators/s1940 2022-01-21 16:27:09 +03:00
fb65d3a09d analizators/1481 2022-01-21 16:15:15 +03:00
3d635a4824 analizators/1643 2022-01-21 16:12:05 +03:00
893c4ddc5a Wen: Editor: Added a new parameter to the conversion api method. 2022-01-21 15:07:32 +03:00
2029c34f9c analizators/s1121 2022-01-21 14:02:17 +03:00
cd12b41cc6 analizators/s1125 2022-01-21 14:01:52 +03:00
473259657e analizators/s1118 2022-01-21 13:47:56 +03:00
32c398c044 Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS 2022-01-21 12:53:29 +03:00
728c1b896e analizators/s1104 2022-01-21 12:19:57 +03:00
bf3b0395a5 analizators/s1116 2022-01-21 11:04:08 +03:00
5f78b37e25 analizators/U2U1000 2022-01-20 12:28:48 +03:00
eb9a33c660 analizators/s3218 2022-01-20 11:36:56 +03:00
3f28dfe78a analizators/s3237 2022-01-20 11:36:42 +03:00
f2e33fa4aa analizators/s2365 2022-01-19 18:16:59 +03:00
25050cb5fd analizators/s2223 2022-01-19 17:16:15 +03:00
85f1660b39 analizators/U2U1203 2022-01-19 13:46:21 +03:00
20b60958a8 analizators/U2U1022 2022-01-19 13:24:11 +03:00
fbb50e676e analizators/U2U1202 2022-01-19 12:51:30 +03:00
1403afbc16 analizators/U2U1209 2022-01-19 11:59:14 +03:00
Vashchuk Nikita
5b9668c14f ILinkDao, fix 2022-01-18 19:50:31 +03:00
78047d3b93 analizators/U2U1210 2022-01-18 18:29:46 +03:00
f1f7a82b39 analizators/U2U1208 2022-01-18 17:00:48 +03:00
84638feaf0 analizators/U2U1202 2022-01-18 16:54:24 +03:00
36c26bc803 analizators/U2U1117 2022-01-18 15:40:28 +03:00
21f3c390bb Web: Studio: fixed file name 2022-01-18 14:45:45 +03:00
1a8d88345a Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
#	yarn.lock
2022-01-17 19:02:40 +03:00
Artem Tarasov
f2459ffc78 Web: Doceditor: deleted dir 'webpack' with config 2022-01-17 18:36:55 +03:00
Artem Tarasov
6cc69ac47b Web: Doceditor: added nextjs 2022-01-17 18:35:43 +03:00
0ee1a35424 analizators/U2U1115 2022-01-17 11:22:52 +03:00
77937390ef Web: Fix crash of Wizard with default en-US language 2022-01-14 19:12:58 +03:00
516cd2fd80 analizators/U2U1111 2022-01-14 16:44:02 +03:00
b9884e6b81 Analizators/U2U1107 2022-01-14 16:32:06 +03:00
4bf841581f Analizators/U2U1104 2022-01-14 16:12:37 +03:00
Artem Tarasov
c10c60a148 Merge branch 'develop' into feature/doceditor-ssr 2022-01-14 13:03:40 +03:00
48897308d7 refactoring 2022-01-13 22:17:56 +03:00
6b883bcd60 Merge branch 'develop' into feature/support-elasticache 2022-01-13 18:16:43 +03:00
9bc8584184 analizators/U2U1103 2022-01-13 15:53:57 +03:00
4155f911c0 analizators/U2U1025 2022-01-13 14:19:39 +03:00
6f90864ed8 Merge branch 'hotfix/v1.1.1' into feature/socket-io 2022-01-13 10:49:43 +03:00
8b327ceb66 Web: Socket.IO: Extended /api/2.0/settings with socketUrl + refactoring of client socket usage 2022-01-12 20:13:30 +03:00
66cf28ba29 analizators/U2U1100 2022-01-12 18:42:03 +03:00
aba8cb9174 Web: Studio: fixed logo styles 2022-01-12 16:11:14 +03:00
2ffa9eb180 Web: Studio: added icons to header for desktop view 2022-01-12 15:53:52 +03:00
6961f38593 analizators/U2U1023 2022-01-12 15:34:58 +03:00
60c45e8c5e Web: Client: Wizard: Fixed issue with default portal language inside selector 2022-01-12 11:08:51 +03:00
efb51c613f refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
c85c2e6f26 analizators/U2U1007 2022-01-11 18:37:10 +03:00
Dmitry Kulak
de8fdb748d Web: Studio: Header: Fixed spacing between burger menu button and logo 2022-01-11 14:37:11 +03:00
Artem Tarasov
ceb11e78ee Web: DocEditor: fix after merge 2022-01-11 14:13:26 +03:00
Artem Tarasov
6b954d45f5 Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	web/ASC.Web.Editor/webpack.config.js
2022-01-11 14:11:47 +03:00
Artem Tarasov
7fc992c9f4 Web: DocEditor: applied RectDOM.hydration() instead of ReactDOM.render() 2022-01-11 12:59:03 +03:00
Artem Tarasov
c7121997f3 Web: DocEditor: webpack.config.js is split into separate files 2022-01-11 12:57:07 +03:00
Dmitry Kulak
38e09fe63a Web: Studio: Header: Fixed margin for logo on Personal 2022-01-10 19:17:23 +03:00
c43f244282 analizators/U2U1003 2022-01-10 18:13:30 +03:00
a671732da5 analizators/SCS0005 2022-01-10 12:24:21 +03:00
6cbd02b71c Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
#	products/ASC.Files/Client/webpack.config.js
#	products/ASC.Files/Server/DocStore
#	yarn.lock
2022-01-10 11:06:32 +03:00
a7dc8c7dfd sync CommunityServer and AppServer cache via redis 2021-12-30 18:09:20 +03:00
Dmitry Kulak
84b1a18137 Web: Studio: Fixed header not closing on item click 2021-12-29 10:41:10 +03:00
a40b06648a analizators/s3963 2021-12-28 19:01:12 +03:00
5e91416c53 analizators/s4035 2021-12-28 18:44:54 +03:00
9d43cb07ba Files: fix after merge 2021-12-28 18:40:42 +03:00
bedfad1ec5 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2021-12-28 18:21:44 +03:00
0a786bbfa3 analizators/s4830 2021-12-28 15:00:48 +03:00