Commit Graph

17201 Commits

Author SHA1 Message Date
9ef0e03143 Fixed Bug 55330 - Client. Fixed header title. 2022-02-14 14:31:31 +03:00
Timofey
154fdb4a81 Merge branch 'develop' into feature/virtual-rooms-1.2 2022-02-14 18:54:34 +08:00
Timofey
6666129fdb Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-02-14 18:53:55 +08:00
Timofey
ec77078bd7 Web:People:Components: change people selector base props 2022-02-14 18:53:20 +08:00
Timofey
2059be9a95 Web:Files:Section: connect new filter input with backend API 2022-02-14 18:52:38 +08:00
Timofey
94cc2b044a Web:Common:NewFilterInput: add people selector 2022-02-14 18:50:26 +08:00
11ec12801a Web:Studio:Added showReminder to true on title change. 2022-02-14 13:49:48 +03:00
Timofey
be4d248050 Web:Common:AdvancedSelector: remove modal view and change aside view with 1.2.1 layouts 2022-02-14 18:49:27 +08:00
9cb69a930a Web:Studio:Added props hasChanged to display SaveCancelButtons. 2022-02-14 13:13:55 +03:00
11f9c2727b Web:Studio:Added translation of CustomTitlesTooltip. Added keys CustomTitlesFrom, CustomTitlesHeader, CustomTitlesSettingsTooltip, CustomTitlesSettingsTooltip, CustomTitlesText, CustomTitlesWelcome for locales ru. 2022-02-14 00:00:06 +03:00
0bd6afb49d Web:Studio:Removed the onCancelClick method in the CustomTitles component. 2022-02-13 19:48:37 +03:00
bd5a3a8a01 Web:Components:Added styles to SaveCancelButtons. 2022-02-13 19:33:20 +03:00
80bb051d2b Web:Studio:Delete flagChanges key to sessionStorage. 2022-02-13 16:29:46 +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
4fb0bf2e46 fix 2022-02-11 21:18:12 +03:00
6b8304304f fixed starting services 2022-02-11 19:01:38 +03:00
7face205ea Web:Studio:Added flagChanges key to sessionStorage. 2022-02-11 14:57:36 +03:00
d9852789e5 Web:Studio:Added HelpButton to the CustomTitles component, added props sectionWidth, styled the component. Added CustomTitles to the Customization component. 2022-02-11 14:55:04 +03:00
a497f3ff19 Web: Files: fixed files fileStatus 2022-02-11 13:42:17 +03:00
Vashchuk Nikita
7164c54b44 fix 2022-02-10 21:25:40 +03:00
8a0aeda83c Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-10 19:50:30 +03:00
fecb7d5e37 Fix Bug 49777 - Docs. The version icon does not appear next to the file name after it has been created and edited. 2022-02-10 19:49:44 +03:00
2736a945dc Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-10 18:57:21 +03:00
fc8afde327 Fixed Bug 55449 - Client.Files. Fixed copying of file opened in editor. 2022-02-10 18:57:11 +03:00
a0097b39ca Merge branch 'feature/hotkeys' of github.com:ONLYOFFICE/AppServer into feature/hotkeys 2022-02-10 17:46:05 +03:00
d2f17efea5 Web: Files: removed unused code 2022-02-10 17:45:47 +03:00
a060c5954d WebL Files: Fix Bug 55397 - Client.Files. Open location menu on Folder 2022-02-10 17:19:21 +03:00
fcf8045794 Web:Studio: Added Consumer and props sectionWidth to the Customization component. 2022-02-10 17:08:29 +03:00
a911fbe523 Web:Components:Changed the styles of the SaveCancelButtons component, added props sectionWidth. 2022-02-10 17:07:50 +03:00
ad08e03019
Merge branch 'develop' into feature/hotkeys 2022-02-10 16:51:23 +03:00
77e14da218 fixed tests 2022-02-10 16:24:55 +03:00
42ebb57828 Web: Files: Hotkeys: added macOs support 2022-02-10 15:48:26 +03:00
79532ea198 Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-10 15:23:37 +03:00
0e0ce0a9bb Web: Files: fixed hotkeys logic 2022-02-10 15:11:01 +03:00
655c0e9122 Web: Files: fixed hotkey symbol for macOS 2022-02-10 14:25:03 +03:00
0d302d5549 Web: Files: fixed files view after resize 2022-02-10 14:03:25 +03:00
b066587fdc Web: Files: fixed selectUpper 2022-02-10 12:44:25 +03:00
76a1c392c2 Web: Files: fixed hotkeys selection 2022-02-10 12:11:57 +03:00
019747995c Web: Files: fixed file selection hotkey 2022-02-10 12:00:12 +03:00
50137b8c12 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-10 11:25:12 +03:00
ef87651b3a Fixed Bug 55254 - Client.Files. Fixed the change of the cursor to the "palm" 2022-02-10 11:25:00 +03:00
c9042a4417 Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-10 11:11:24 +03:00
caa4db9790 add new lines (Files-Home) 2022-02-10 11:10:35 +03:00
5c9336d50b
Bugfix/update OneClickInstall (#505)
* Add document server image configuration

* Modify docker document server run config (#476)

* Changing the files installation

* Add an update to Docker-1click

* Minor changes

* Fix mysql installation

* Change the kafka installation

* Update kafka version

* Download sql scripts
2022-02-10 10:37:09 +03:00
Timofey
84f811f16c Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-02-10 14:01:05 +08:00
e825bc4fe3 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-02-09 21:16:05 +03:00
f4391be6f7 Web:Studio:Added displaySettings prop for SaveCancelButtons. 2022-02-09 21:13:22 +03:00
31fe8e4325 Web:Components:Added a new displaySettings props for SaveCancelButtons. 2022-02-09 21:12:06 +03:00
8f52c452e8 Web:Studio:Added a new key "LanguageTimeSettingsTooltipDescription" for locales fr, de, it, pr-BR. 2022-02-09 21:09:15 +03:00
3429b83f3f Web:Studio:Added a new key "LanguageTimeSettingsTooltipDescription" to the LanguageTimeSettingsTooltip component and for locales en, ru. 2022-02-09 20:41:44 +03:00