|
eae8b7c0bb
|
Web: Socket: Added "restore-backup" event listeners
|
2022-02-25 19:08:02 +03:00 |
|
Dmitry Kulak
|
92d3a3275f
|
Web: Studio: Homepage: Fixed greeting message styles
|
2022-02-25 18:57:24 +03:00 |
|
|
5a19f21902
|
Merge pull request #559 from ONLYOFFICE/feautre/asc-messaging-system-refactor
Feautre/asc messaging system refactor
|
2022-02-25 17:53:44 +03:00 |
|
|
93e5cf889c
|
Web: RestoreBackup: Added error handler for local file.
|
2022-02-25 17:17:18 +03:00 |
|
|
2bb84187e3
|
Web: Backup: Added help information for modules.
|
2022-02-25 17:10:27 +03:00 |
|
|
6495da0d0b
|
Merge branch 'feature/backend-refactor' into feature/asc-messaging-system-refactor
|
2022-02-25 16:34:15 +03:00 |
|
|
0302dfd9ac
|
Web: ManualBackup: Fixed temporary link for desktop version.
|
2022-02-25 16:27:17 +03:00 |
|
|
b1e5a6e28b
|
Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor
|
2022-02-25 16:16:56 +03:00 |
|
|
f07aa0a183
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# config/nginx/onlyoffice.conf
# packages/asc-web-common/constants/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
|
2022-02-25 16:05:43 +03:00 |
|
|
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 |
|
|
e066add5ea
|
Web: Client: Tfa auth error test
|
2022-02-25 00:09:49 +03:00 |
|
|
cdc8e90b79
|
Web: Client: Tests: update screenshots
|
2022-02-24 23:04:28 +03:00 |
|
|
b62f56f7e2
|
Web: Client: Tests: Tfa activation success test
|
2022-02-24 23:03:03 +03:00 |
|
|
6e2db127c0
|
Web: Client: Tests: mock data
|
2022-02-24 23:01:52 +03:00 |
|
|
86dcb3c62f
|
Web: Client: Tests: TfaActivation render test
|
2022-02-24 22:45:17 +03:00 |
|
|
1cbd56bfee
|
Web: Client: Tests: mock data
|
2022-02-24 22:44:54 +03:00 |
|
|
d55d1c4905
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/confirm-test
|
2022-02-24 22:20:42 +03:00 |
|
|
d40d73a3a5
|
GoogleAuth: fix 94 issue
|
2022-02-24 17:36:44 +03:00 |
|
|
7e67e9a41c
|
merge from develop
|
2022-02-24 17:33:02 +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 |
|
|
6925a83060
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Common/Caching/ICacheNotify.cs
# common/ASC.Common/Caching/KafkaCache.cs
# common/ASC.Common/Caching/MemoryCacheNotify.cs
# common/ASC.Common/Threading/DistributedTaskProgress.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.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/DeletePortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/ASC.Data.Backup.Core/Tasks/RestorePortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.Data.Storage/BaseStorage.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSessionHolder.cs
# common/ASC.Data.Storage/CrossModuleTransferUtility.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
# common/ASC.Data.Storage/Extensions.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/IDataStore.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Data.Storage/S3/S3UploadGuard.cs
# common/ASC.Data.Storage/StaticUploader.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.Data.Storage/StorageUploader.cs
# common/ASC.Data.Storage/WebPath.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# common/services/ASC.AuditTrail/AuditEventsRepository.cs
# common/services/ASC.AuditTrail/AuditReportCreator.cs
# common/services/ASC.AuditTrail/LoginEventsRepository.cs
# products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/ILinkDao.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IProviderDao.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IProviderInfo.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/ITagDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/AbstractDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/LinkDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/Entries/ChunkedUploadSession.cs
# products/ASC.Files/Core/Core/Entries/EncryptionKeyPair.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/FilesIntegration.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Security/IFileSecurity.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoBase.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/Box/BoxProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoBase.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/Dropbox/DropboxProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoBase.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/GoogleDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoBase.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/OneDriveProviderInfo.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/ProviderDao/ProviderTagDao.cs
# products/ASC.Files/Core/Core/Thirdparty/RegexDaoSelectorBase.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxProviderInfo.cs
# products/ASC.Files/Core/Helpers/DocuSignHelper.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Helpers/PathProvider.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/SearchHandler.cs
# products/ASC.Files/Core/Model/FileEntryWrapper.cs
# products/ASC.Files/Core/Model/FileOperationWraper.cs
# products/ASC.Files/Core/Model/FileWrapper.cs
# products/ASC.Files/Core/Model/FolderContentWrapper.cs
# products/ASC.Files/Core/Model/FolderWrapper.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.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/Services/WCFService/FileOperations/FileOperationsManager.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
# products/ASC.Files/Core/Utils/ChunkedUploadSessionHolder.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/FileShareLink.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Core/Utils/MailMergeTask.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/AuthenticationController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/BuildVersion.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/Notify/StudioNotifyServiceSender.cs
# web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
# web/ASC.Web.Core/Recaptcha.cs
# web/ASC.Web.Core/Sms/SmsManager.cs
# web/ASC.Web.Core/Sms/SmsProvider.cs
# web/ASC.Web.Core/Sms/SmsSender.cs
# web/ASC.Web.Core/SpaceUsageStatManager.cs
# web/ASC.Web.Core/Utility/UrlShortener.cs
|
2022-02-23 22:42:34 +03:00 |
|
|
8563fbc373
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Middleware/CommonApiResponse.cs
# common/ASC.Api.Core/Middleware/ResponseWrapper.cs
# common/ASC.Core.Common/Context/Impl/SubscriptionManager.cs
# products/ASC.Files/Core/Configuration/FilesSettings.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
|
2022-02-23 17:37:34 +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 |
|
|
944d6df003
|
Web: Client: Tests: profile remove success action test
|
2022-02-22 20:39:38 +03:00 |
|
|
8093cbe2e9
|
Web: Client: Tests: init screenshots
|
2022-02-22 17:34:52 +03:00 |
|
|
b4a991a1eb
|
Web: Client: Tests: tfa auth success action test
|
2022-02-22 16:26:24 +03:00 |
|
|
45c3ae4cb5
|
Web: Client: Tests: mock data
|
2022-02-22 16:25:38 +03:00 |
|
|
27254146ae
|
Web: Files: Restore: Added new loader.
|
2022-02-22 15:38:36 +03:00 |
|
|
6cac13ee1c
|
Web: Client: Tests: fix urls
|
2022-02-22 14:34:45 +03:00 |
|
|
1b562487c7
|
Web: Client: Tests: change password render test
|
2022-02-22 14:33:22 +03:00 |
|
|
b00fcfc1b1
|
Web: Client: fix password change page render
|
2022-02-22 14:30:38 +03:00 |
|
|
32868de412
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# public/locales/de/Common.json
|
2022-02-22 13:53:00 +03:00 |
|
|
64fe39d3cc
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/confirm-test
|
2022-02-22 13:50:06 +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 |
|
|
7ff2481e25
|
Web: Client: Tests: activate user render test
|
2022-02-21 22:43:22 +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 |
|
|
a842720f6c
|
Web: Client: Tests: change owner render test
|
2022-02-21 22:20:08 +03:00 |
|
|
18ae85b164
|
Web: Client: Tests: create user render test
|
2022-02-21 22:12:45 +03:00 |
|
|
9e5253a812
|
Web: Client: Tests: mock data
|
2022-02-21 22:12:16 +03:00 |
|
|
f59648230d
|
Web: Client: Tests: change phone render test
|
2022-02-21 22:01:36 +03:00 |
|
|
9b1b47ae12
|
Web: Client: fix translate
|
2022-02-21 18:43:35 +03:00 |
|
|
c0c0188f2c
|
Web: Client: fix by layout
|
2022-02-21 18:43:22 +03:00 |
|
|
9fe4971055
|
add mapping, project reorganization
|
2022-02-21 18:35:57 +03:00 |
|
|
c69ed2bc18
|
Web: Client: add redirect
|
2022-02-21 18:31:47 +03:00 |
|
|
efd4ade61f
|
Web: Client: add translate
|
2022-02-21 18:27:35 +03:00 |
|
|
66a410cf1c
|
Web: Client: add invalid error screen
|
2022-02-21 18:27:23 +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 |
|
|
5b5ed4a4e3
|
Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor
|
2022-02-18 18:55:59 +03:00 |
|
|
89cc5bfbec
|
Api: added cookiesettings
|
2022-02-18 18:28:03 +03:00 |
|
|
e736ceed72
|
Web: Client: Tests: profile remove render test
|
2022-02-18 17:55:15 +03:00 |
|
|
3a0a9cf16e
|
Web: Client: Tests: mock settings
|
2022-02-18 17:53:35 +03:00 |
|
Timofey
|
f30cb432f7
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-18 22:31:28 +08:00 |
|
Timofey
|
8c73f93eed
|
Web:Files:Catalog: fix section rerender when catalog opening on mobile
|
2022-02-18 20:46:49 +08:00 |
|
|
4143e0cd2c
|
Web: Client: Tests: TfaAuth render test
|
2022-02-18 14:03:55 +03:00 |
|
|
f803109419
|
Web: Client: Tests: mock confirm data
|
2022-02-18 14:03:09 +03:00 |
|
|
2e424a106a
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-18 11:00:40 +03:00 |
|
|
f068f60a95
|
Web:Studio:Added languageDefaultFromSessionStorage and timezoneDefaultFromSessionStorage keys to sessionStorage. Fixed showReminder output.
|
2022-02-18 10:59:38 +03:00 |
|
|
41b5a1dcd1
|
Web: Files: Hidden elements of NavMenu, disabled click on logo.
|
2022-02-18 10:54:53 +03:00 |
|
|
c998797aed
|
Settings: update password settings
|
2022-02-17 18:25:07 +03:00 |
|
|
91c3fa878b
|
Portal: portalrename method
|
2022-02-17 16:39:47 +03:00 |
|
|
1ef4b32939
|
Settings: added update dns settings method
|
2022-02-17 15:55:42 +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 |
|
Vashchuk Nikita
|
0a384b2c28
|
refactoring async methods
|
2022-02-16 15:57:37 +03:00 |
|
Viktor Fomin
|
fb8e0748f6
|
Web: Campaigns: add ads examples
|
2022-02-16 14:11:49 +03:00 |
|
|
f978cb657d
|
Web: files: AutoBackup: Optimization saving process.
|
2022-02-16 11:24:12 +03:00 |
|
|
b5ebbef616
|
Web: files: AutoBackup: Delete useless code.
|
2022-02-16 10:11:08 +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 |
|
|
ca7140186d
|
Core: resolve properties for mapping, add mapping/projection
|
2022-02-15 13:30:05 +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 |
|
Timofey
|
8ac30689a3
|
Web:Studio:Settings: change props for people selector in owner page
|
2022-02-15 15:01:21 +08:00 |
|
Timofey
|
f9162966b4
|
Web:Studio:Settings: change props for people selector in admin page
|
2022-02-15 15:01:06 +08:00 |
|
|
853d2280b6
|
Web: Files: RestoreBackup: Hidden elements of header.
|
2022-02-15 09:24:44 +03:00 |
|
|
481581e424
|
Core: private properties replaced by private fields, add braces
|
2022-02-15 00:02:57 +03:00 |
|
|
64dd260a07
|
Merge pull request #531 from ONLYOFFICE/feature/refactoring-healthChecks.UI
Feature/refactoring health checks.UI
|
2022-02-14 19:24:08 +03:00 |
|
|
4e717e7bcd
|
Merge pull request #530 from ONLYOFFICE/feature/refactoring-webstudio
Feature/refactoring webstudio
|
2022-02-14 19:22:45 +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 |
|
|
f0fc434447
|
Web:Studio:Added PortalRenaming component. Removed the TeamTemplate component from the Customization component.
|
2022-02-14 16:33:27 +03:00 |
|
|
f6bb6b8ec2
|
Web: Campaigns: add firebase deploy script
|
2022-02-14 16:26:36 +03:00 |
|
|
f78bd8224a
|
Web: Campaigns: move bar-templates in root folder
|
2022-02-14 16:06:39 +03:00 |
|
|
0ba2e2d933
|
Web: Client: Tests: add test
|
2022-02-14 15:06:27 +03:00 |
|
|
b7d6454dbe
|
Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner
|
2022-02-14 14:39:31 +03:00 |
|
|
11ec12801a
|
Web:Studio:Added showReminder to true on title change.
|
2022-02-14 13:49:48 +03:00 |
|
|
530387a258
|
Web: Client: Tests: fix typo
|
2022-02-14 13:20:18 +03:00 |
|
|
9cb69a930a
|
Web:Studio:Added props hasChanged to display SaveCancelButtons.
|
2022-02-14 13:13:55 +03:00 |
|
|
8b5a4f4670
|
Web: Client: add start tests commands
|
2022-02-14 12:58:58 +03:00 |
|
|
89e4fabe2d
|
Web: Client: Tests: add helpers
|
2022-02-14 12:58:20 +03:00 |
|
|
8288f3c4ca
|
Common: return IEventBust to ICacheNotify
|
2022-02-14 12:05:05 +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 |
|
|
ab0378aed3
|
Merge branch 'feature/backend-refactor' into feature/refactoring-healthChecks.UI
|
2022-02-11 18:11:04 +03:00 |
|
|
adc406fba1
|
refactoring: reorganizing
|
2022-02-11 18:10:40 +03:00 |
|
|
d101aaa3ba
|
refactoring: reorganizing
|
2022-02-11 18:05:40 +03:00 |
|
|
1ff67b6b1c
|
Merge branch 'feature/backend-refactor' into feature/refactoring-webstudio
|
2022-02-11 18:00:03 +03:00 |
|
|
7b36caac60
|
Merge branch 'feature/backend-refactor' into feature/asc-common-refactor
|
2022-02-11 16:19:25 +03:00 |
|
|
dba3efb235
|
Merge branch 'feature/backend-refactor' into feature/asc-common-refactor
# Conflicts:
# common/ASC.Api.Core/GlobalUsings.cs
# common/ASC.Common/Caching/AscCache.cs
# common/ASC.Common/Collections/CachedDictionaryBase.cs
# common/ASC.Common/Collections/HttpRequestDictionary.cs
# common/ASC.Common/DIHelper.cs
# common/ASC.Common/Data/StreamExtension.cs
# common/ASC.Common/Data/TempStream.cs
# common/ASC.Common/DependencyInjection/AutofacExtension.cs
# common/ASC.Common/Logging/Log.cs
# common/ASC.Common/Logging/SelfCleaningTarget.cs
# common/ASC.Common/Logging/SpecialFolderPathConverter.cs
# common/ASC.Common/Mapping/MappingProfile.cs
# common/ASC.Common/Security/AscRandom.cs
# common/ASC.Common/Security/Authorizing/AuthorizingException.cs
# common/ASC.Common/Security/Authorizing/Constants.cs
# common/ASC.Common/Security/Authorizing/Domain/Role.cs
# common/ASC.Common/Security/Cryptography/Hasher.cs
# common/ASC.Common/Threading/DistributedTask.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Common/Utils/DnsLookup.cs
# common/ASC.Common/Utils/HtmlUtil.cs
# common/ASC.Common/Utils/HttpRequestExtensions.cs
# common/ASC.Common/Utils/JsonWebToken.cs
# common/ASC.Common/Utils/MailAddressUtils.cs
# common/ASC.Common/Utils/RandomString.cs
# common/ASC.Common/Utils/TimeZoneConverter/TimeZoneConverter.cs
# common/ASC.Common/Utils/VelocityFormatter.cs
# common/ASC.Common/Utils/Wildcard.cs
# common/ASC.Common/Web/MimeMapping.cs
# common/ASC.Common/Web/VirtualPathUtility.cs
# common/services/ASC.ClearEvents/Program.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
|
2022-02-11 16:17:55 +03:00 |
|
|
637cdd6ed7
|
Web: Client: init e2e tests
|
2022-02-11 14:59:09 +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 |
|
|
6693d56846
|
refactoring: update globalUsings
|
2022-02-11 13:36:06 +03:00 |
|
|
05d0fd89ed
|
Merge branch 'feature/backend-refactor' into feature/refactoring-healthChecks.UI
|
2022-02-11 13:35:38 +03:00 |
|
|
3182235fc9
|
refactoring: update globalusings
|
2022-02-11 13:24:23 +03:00 |
|
|
91736a28d1
|
Merge branch 'feature/backend-refactor' into feature/refactoring-webstudio
|
2022-02-11 13:23:56 +03:00 |
|
|
d1f7d41a57
|
Merge branch 'feature/backend-refactor' into feature/asc-audit-trail-refactor
# Conflicts:
# common/ASC.Api.Core/GlobalUsings.cs
# common/ASC.Core.Common/EF/Context/MessagesContext.cs
# common/ASC.MessagingSystem/DbSender/MessagesRepository.cs
# common/services/ASC.AuditTrail/AuditEventsRepository.cs
# common/services/ASC.AuditTrail/LoginEventsRepository.cs
# common/services/ASC.AuditTrail/Mappers/AuditActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/CrmActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/DocumentsActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/LoginActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/OthersActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/PeopleActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/ProjectsActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/SettingsActionMapper.cs
# common/services/ASC.ClearEvents/ClearEventsServiceLauncher.cs
|
2022-02-10 21:54:45 +03:00 |
|
|
8a60005fea
|
Feed: add mapping
|
2022-02-10 21:31:44 +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 |
|
|
d67fb24b68
|
Web: Login: fix translate
|
2022-02-10 18:01:55 +03:00 |
|
|
3229019aad
|
Web: move LoginButton key to Common
|
2022-02-10 18:01:40 +03:00 |
|
|
d05d770a76
|
Web: Login: fix screenshots
|
2022-02-10 17:46:45 +03:00 |
|
|
a09da9d2f2
|
Web: Login: fix test
|
2022-02-10 17:17:13 +03:00 |
|
|
fcf8045794
|
Web:Studio: Added Consumer and props sectionWidth to the Customization component.
|
2022-02-10 17:08:29 +03:00 |
|
|
5022501e58
|
Merge branch 'feature/backend-refactor' into feature/asc-api-core-refactor
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# common/ASC.Api.Core/Auth/CookieAuthHandler.cs
# common/ASC.Api.Core/Core/ApiContext.cs
# common/ASC.Api.Core/Core/ApiDateTime.cs
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Api.Core/Core/CustomHealthCheck.cs
# common/ASC.Api.Core/Middleware/ProductSecurityFilter.cs
# common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Api.Core/Routing/FormatRoute.cs
|
2022-02-10 13:56:54 +03:00 |
|
|
6ee61695be
|
Web: files: added start restore.
|
2022-02-10 13:16:46 +03:00 |
|
|
320a1f2250
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Common/Caching/AscCache.cs
# common/ASC.Common/Data/StreamExtension.cs
# common/ASC.Common/Utils/RandomString.cs
# common/ASC.Core.Common/Billing/CouponManager.cs
# common/ASC.Core.Common/Billing/License/LicenseReader.cs
# common/ASC.Core.Common/Core/UserGroupRef.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Core.Common/Notify/Jabber/JabberServiceClientWcf.cs
# common/ASC.Core.Common/Notify/Telegram/Dao/CachedTelegramDao.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
# common/ASC.Data.Storage/BaseStorage.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Notify.Textile/JabberStyler.cs
# common/ASC.Textile/Blocks/GlyphBlockModifier.cs
# common/ASC.Textile/States/TableRowFormatterState.cs
# common/services/ASC.ApiSystem/Classes/CommonMethods.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# common/services/ASC.ClearEvents/Program.cs
# common/services/ASC.TelegramService/Startup.cs
# common/services/ASC.UrlShortener.Svc/Program.cs
# products/ASC.Files/Core/Core/Entries/File.cs
# products/ASC.Files/Core/Core/Entries/FileEntry.cs
# products/ASC.Files/Core/Core/Entries/FileHelper.cs
# products/ASC.Files/Core/Core/Entries/Folder.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
# products/ASC.Files/Core/Helpers/ThirdpartyConfiguration.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.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/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Core/Files/DocumentService.cs
# web/ASC.Web.Core/Files/DocumentServiceLicense.cs
# web/ASC.Web.Core/QuotaSync.cs
# web/ASC.Web.Core/Sms/SmsKeyStorage.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# web/ASC.Web.HealthChecks.UI/Program.cs
# web/ASC.Web.Studio/Startup.cs
|
2022-02-10 13:16:33 +03: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 |
|
|
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 |
|
|
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 |
|
|
b3eb58971e
|
Web: Login: fix test
|
2022-02-09 15:57:19 +03:00 |
|
|
e8c2ce8294
|
Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup
|
2022-02-09 15:29:14 +03:00 |
|
|
099387672a
|
Web: Client: add welcome translate
|
2022-02-09 15:23:15 +03:00 |
|
|
a7337f6580
|
Web: Files: ManualBackup: Optimization, refactoring.
|
2022-02-09 15:08:48 +03:00 |
|
|
142fa78509
|
Web: Client: delete useless
|
2022-02-09 14:52:09 +03:00 |
|
|
decb3e2408
|
Web: Client: get user info
|
2022-02-09 14:51:33 +03:00 |
|
|
eac90946e6
|
Merge branch 'feature/login-redesign' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-02-09 14:13:19 +03:00 |
|
|
d27a33f08f
|
People: added simple wrapper for getbyid method
fixed invite link
|
2022-02-09 14:05:21 +03:00 |
|
|
f8d4916d99
|
Web: Login: fix style
|
2022-02-09 13:36:50 +03:00 |
|
|
2d64c5950f
|
Web:Studio:Added translations of "DescriptionTimeLanguage" and "LanguageTimeSettingsTooltip" for locales de.
|
2022-02-09 12:57:17 +03:00 |
|
|
d429bcc731
|
Merge branch 'develop' into feature/backup
|
2022-02-09 12:40:16 +03:00 |
|
Timofey
|
b92763912c
|
Web:Studio:Settings: change consumers icon color for dark-theme
|
2022-02-09 17:24:35 +08:00 |
|
|
f9799f8d29
|
Web:Studio:Added translations of "DescriptionTimeLanguage" and "LanguageTimeSettingsTooltip" for locales fr.
|
2022-02-09 11:50:41 +03:00 |
|
|
59cd38c8f0
|
Web: Client: fix error position
|
2022-02-09 11:13:32 +03:00 |
|
|
85a8c7b75b
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-09 10:32:41 +03:00 |
|
|
99fae2f881
|
Web:Studio:Fix theme.
|
2022-02-09 10:32:29 +03:00 |
|
Timofey
|
c52628270c
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-02-09 15:08:53 +08:00 |
|
|
f1eef443ff
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-02-08 23:00:28 +03:00 |
|
|
b1332d5895
|
Web: Login: fix translate namespace
|
2022-02-08 22:41:28 +03:00 |
|
|
cc81a680a3
|
Web: Client: fix translate namespace
|
2022-02-08 22:41:13 +03:00 |
|
|
817a155642
|
Web: move ShowMore to Common translate
|
2022-02-08 22:34:21 +03:00 |
|
|
0184f2b319
|
Web: Client: fix clear errors, add enter submit
|
2022-02-08 22:31:15 +03:00 |
|
|
7c201a4280
|
Web: Client: fix OAuth signup
|
2022-02-08 22:27:56 +03:00 |
|
|
e49deab37a
|
Web: Client: fix logic create user
|
2022-02-08 22:16:05 +03:00 |
|
|
52ade5183e
|
Web:Studio:Fix.
|
2022-02-08 19:34:58 +03:00 |
|
|
b866e5cccc
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-08 18:17:41 +03:00 |
|
|
783d5bd95e
|
Web: files: restoreBackup: Optimization.
|
2022-02-08 17:53:17 +03:00 |
|
|
3998ea06b0
|
Web:Studio:Added the LanguageAndTimeZone component to the Customization component.
|
2022-02-08 17:44:07 +03:00 |
|
|
16f3adcb64
|
Web:Studio:Added the "Automatic time zone" method to the LanguageAndTimeZone component. Added HelpButton for StudioTimeLanguageSettings header.Added an image for the HelpButton component.
|
2022-02-08 17:43:56 +03:00 |
|
|
51176cae7d
|
Web:Studio:Added common-tooltips file and LanguageTimeSettingsTooltip component. Added translations of "DescriptionTimeLanguage" and "LanguageTimeSettingsTooltip" for locales en, ru.
|
2022-02-08 17:43:32 +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 |
|
|
0a716b181e
|
Web: Client: fix styles
|
2022-02-08 13:36:50 +03:00 |
|
Timofey
|
cbb18e87d2
|
Web:Client: change logo in dark theme for about page
|
2022-02-08 18:31:55 +08:00 |
|
|
f879125045
|
Web: Client: added checkMaintenance when firebase helper not enable
|
2022-02-08 14:56:34 +05:00 |
|
Timofey
|
bdb587199b
|
Web:Studio: add support dark-theme for top arrow in profile menu
|
2022-02-08 17:52:22 +08: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 |
|
|
857f068afd
|
Web: Client: delete useless
|
2022-02-07 22:08:33 +03:00 |
|
|
bcae8bb718
|
Web: Client: fix submit/oAuth
|
2022-02-07 22:08:02 +03:00 |
|
|
8f0f529b1e
|
Web: Client: add new block for create user
|
2022-02-07 21:53:51 +03:00 |
|
|
213c8c5756
|
Web: Client: fix create user style
|
2022-02-07 21:07:45 +03:00 |
|
|
e39fa3edaf
|
Web: Login: expose more-login
|
2022-02-07 21:07:00 +03:00 |
|
|
f9c6cdf038
|
Web: Client: refactoring and redesign create user
|
2022-02-07 20:55:06 +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 |
|
Timofey
|
5b17663403
|
Web:Studio:Header: add theme support for catalog-burger in mobile view
|
2022-02-07 21:56:03 +08: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 |
|
Timofey
|
6f80b60091
|
Merge branch 'feature/dark-theme' into feature/virtual-rooms-1.2
|
2022-02-07 16:31:56 +08:00 |
|
|
c0a83cefac
|
Merge branch 'develop' into feature/dark-theme
|
2022-02-07 11:09:41 +03:00 |
|
|
db0f49708a
|
Web: Login/Client: redirect to enter code page
|
2022-02-07 08:10:20 +03:00 |
|
|
ea65388497
|
Web: Login: disable input when enter code
|
2022-02-07 08:03:13 +03:00 |
|
|
73a0dc5588
|
Web: Login: add manually log in
|
2022-02-06 22:55:59 +03:00 |
|
|
246720c4fa
|
Web: Login: fix dialog style
|
2022-02-06 22:53:48 +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 |
|
|
b2e779d7d8
|
Merge branch 'feature/backend-refactor' into feature/asc-common-refactor
|
2022-02-04 23:27:29 +03:00 |
|
|
c67c5e80e2
|
Merge branch 'feature/backend-refactor' into feature/asc-audit-trail-refactor
|
2022-02-04 23:20:49 +03:00 |
|
|
a913fa4589
|
Merge branch 'feature/backend-refactor' into feature/asc-api-core-refactor
|
2022-02-04 23:16:18 +03:00 |
|
|
8a90ccc30b
|
Merge pull request #504 from ONLYOFFICE/feature/refactoring
Feature/refactoring
|
2022-02-04 22:42:16 +03:00 |
|
|
9395c23081
|
Merge branch 'develop' into feature/cluster-services-backup
|
2022-02-04 21:00:27 +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 |
|
|
f3b3b08af1
|
add support rabbitmq. split ASC.Data.Backup service on two services
|
2022-02-04 20:44:03 +03:00 |
|
|
acc102fa8d
|
Web: Login: delete useless
|
2022-02-04 18:34:17 +03:00 |
|
|
e8feb6af1c
|
Web: Login: delete useless
|
2022-02-04 18:33:09 +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 |
|
Timofey
|
48f9e4953c
|
Web:Client:Components: refactoring navigation-item icon component and change margin top and bottom for logo
|
2022-02-04 16:12:38 +08:00 |
|
|
3a16fdccfd
|
Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner
|
2022-02-03 21:05:07 +03:00 |
|
|
731cbc649b
|
Merge pull request #500 from ONLYOFFICE/feature/socket-io
Feature/socket io
|
2022-02-03 20:58:18 +03:00 |
|
Timofey
|
bd8d8180f9
|
Web: fixed code format
|
2022-02-03 23:34:19 +08:00 |
|
|
0f76ba3613
|
Fixed Bug 55236 - Editor: File from third-party storage is can added to favorites.
|
2022-02-03 17:49:00 +03:00 |
|
|
973624c30b
|
Merge branch 'feature/refactoring' into feature/asc-common-refactor
|
2022-02-03 17:30:13 +03:00 |
|
|
bd674080fe
|
refactoring: healthChecks
|
2022-02-03 17:08:54 +03:00 |
|
|
25504f1d8b
|
refactoring: web.studio
|
2022-02-03 16:53:42 +03:00 |
|
|
3ad4ba6c08
|
fix after merge
|
2022-02-03 16:53:34 +03:00 |
|
|
e6665bb8c9
|
Merge branch 'feature/refactoring' into feature/asc-audit-trail-refactor
|
2022-02-03 16:46:17 +03:00 |
|
|
fd5839822d
|
Web: Client: fix recover access style
|
2022-02-03 16:29:41 +03:00 |
|
|
487a55a99e
|
ApiCore: used file-scope namespaces, fix conflicts
|
2022-02-03 16:19:48 +03:00 |
|
|
bd8d980f6c
|
Web: Files: Fixed manual backup.
|
2022-02-03 16:12:12 +03:00 |
|
|
a477947042
|
Web: Login: add error/warning bar
|
2022-02-03 16:08:22 +03:00 |
|
|
524fb32a0d
|
Merge branch 'feauter/refactoring' into feauter/asc-api-core-refactor
|
2022-02-03 16:08:15 +03:00 |
|
|
66dfe12d8d
|
Web: Login: add translate
|
2022-02-03 16:07:04 +03:00 |
|
Timofey
|
223c04a3c7
|
Merge branch 'feature/dark-theme' into feature/virtual-rooms-1.2
|
2022-02-03 20:59:26 +08: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 |
|
|
8819718933
|
Web: Client: show login page by flag
|
2022-02-03 01:39:16 +03:00 |
|
|
8e79b98864
|
Web: Login: add webpack expose
|
2022-02-03 01:37:43 +03:00 |
|
|
a0e1f31f5b
|
Web: Login: delete useless
|
2022-02-03 01:36:05 +03:00 |
|
|
2de4d2b96c
|
Web: Login: add new rooms login page
|
2022-02-03 01:18:24 +03:00 |
|
|
6e5a1572b4
|
Web: Login: fix show sso
|
2022-02-03 01:10:36 +03:00 |
|
|
14f02ea7f8
|
Web: Login: delete useless
|
2022-02-03 00:59:25 +03:00 |
|
|
bc7811b8eb
|
Web: Login: add submit func
|
2022-02-03 00:51:08 +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 |
|
|
6750931fe9
|
Web: Files: Added error handler for request edit rights function.
|
2022-02-02 18:29:00 +03:00 |
|
|
76eead7708
|
Web: Files: Fixed editing of shared form.
|
2022-02-02 18:16:52 +03:00 |
|
|
c718ce6cd6
|
Web: Login: add code input page
|
2022-02-02 16:14:19 +03:00 |
|
|
e3473c1bde
|
Web: Login: add translate
|
2022-02-02 16:13:57 +03:00 |
|
|
c25a57582e
|
Web: Login: fix style
|
2022-02-02 16:13:33 +03:00 |
|
|
f6620e34ae
|
Merge branch 'develop' into feature/refactoring
|
2022-02-02 13:09:25 +03:00 |
|
|
1049f78462
|
Web: Login: add workspace login page
|
2022-02-02 12:40:25 +03:00 |
|
|
c7e0b77883
|
Web: Login: add translations
|
2022-02-02 12:40:07 +03:00 |
|
|
5a71df17d3
|
refactoring: bugfix
|
2022-02-02 12:02:49 +03:00 |
|
|
94d51d88b5
|
Web: ASC.Web.Campaigns: added gatsby project
|
2022-02-01 20:03:37 +05:00 |
|
|
fbf0dcc6f5
|
Web: Login: fix get sso
|
2022-02-01 17:44:12 +03:00 |
|
|
01fdb34aaa
|
Web: ACS.Web.Campaigns: delete submodule
|
2022-02-01 19:18:23 +05:00 |
|
|
c8f1fc9f03
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-02-01 16:53:56 +03:00 |
|
|
a7e710726c
|
Web: Login: add sso in more login
|
2022-02-01 15:20:59 +03:00 |
|
|
f2c0f3ec77
|
Common: ICahcheNotify is reduced to IEventBus
|
2022-02-01 14:38:03 +03:00 |
|
|
fa175efb73
|
Web: Login: move styles
|
2022-02-01 13:36:08 +03:00 |
|
|
94b364efcb
|
Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner
|
2022-02-01 13:33:27 +05:00 |
|
|
6102fce721
|
Web: ASC.Web.Campaigns:added project for creating banner templates
|
2022-02-01 13:30:32 +05:00 |
|
|
f6b374226f
|
Web: Client: added skip maintenance param, added onLoad func for bar config
|
2022-02-01 12:51:49 +05:00 |
|
|
a40e8bf755
|
Web: Client: deleted checkedMaintenance
|
2022-02-01 12:49:38 +05:00 |
|
Timofey
|
cf3d4c71e3
|
Merge branch 'devlop' into branch feature/catalog
|
2022-01-31 23:52:52 +08:00 |
|
|
55a9310744
|
refactoring: add globalusings: web.api
|
2022-01-31 18:13:08 +03:00 |
|
Vashchuk Nikita
|
2901d837a1
|
async methods for httpClient in ASC.Web
|
2022-01-31 17:35:36 +03:00 |
|
|
7ab885b2e2
|
refactoring: bugfix
|
2022-01-31 16:56:30 +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 |
|
|
615252c487
|
Web: add sso button
|
2022-01-31 12:33:39 +03:00 |
|
|
01831ad0b6
|
refactoring: add globalusings: web.studio
|
2022-01-31 11:33:18 +03:00 |
|
|
0f6ec5f532
|
refactoring: add globalusings: web.healthChecks.ui
|
2022-01-31 11:31:43 +03:00 |
|
|
cefa25a391
|
refactoring: add globalusings: web.core
|
2022-01-31 11:30:08 +03:00 |
|
Timofey
|
21cd73a698
|
Web: restore code format
|
2022-01-28 21:44:58 +08:00 |
|
Timofey
|
95da73cda6
|
Web:Editor: app theme-support for loader background-color
|
2022-01-28 20:49:37 +08:00 |
|
Timofey
|
98e4233a2d
|
Web:Studio:Settings: add support dark-theme for link in tooltip
|
2022-01-28 19:31:56 +08:00 |
|
|
5db134933b
|
Web: Files: Fixed error when clicked on "change access rights" twice.
|
2022-01-28 13:01:08 +03:00 |
|
|
663c7aef90
|
Web: Login: fix or label
|
2022-01-28 03:12:24 +03:00 |
|
|
24261c843a
|
Web: Files: fix buttons width
|
2022-01-28 02:40:47 +03:00 |
|
|
03512706f0
|
Web: Login: fix show social buttons
|
2022-01-28 02:27:02 +03:00 |
|
|
429266b5e5
|
Web: Login: add social auth
|
2022-01-28 02:13:49 +03:00 |
|
|
53179bb9e3
|
Web: Login> fix body style
|
2022-01-28 02:06:54 +03:00 |
|
|
c03ea33c4d
|
Web: Login: fix styles
|
2022-01-27 19:33:55 +03:00 |
|
Timofey
|
15dd9b0642
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-27 22:21:06 +08:00 |
|
Timofey
|
18ed20569d
|
Web:Editor: wrap editor in theme provider and delete theme as props in components
|
2022-01-27 21:54:58 +08:00 |
|
|
dbafbc738c
|
Web: Client: fixed the navbar positioning
|
2022-01-27 17:45:01 +05:00 |
|
|
1908af64f0
|
cache: return support kafka. refactoring
|
2022-01-27 15:20:51 +03:00 |
|
|
5f843a1d5d
|
Web: Client: added checked and exist params for maintenance banner
|
2022-01-27 17:19:03 +05:00 |
|
|
988e822a80
|
Web: Client: changed positioning when there is a banner on the page
|
2022-01-27 17:16:47 +05:00 |
|
|
9ce1930f9a
|
Web: Login: add more login panel
|
2022-01-26 21:06:57 +03:00 |
|
|
79cd500028
|
Web: Login: fix greeting title style
|
2022-01-26 19:22:33 +03:00 |
|
|
3447ec4834
|
Web: Login: redesign login page
|
2022-01-26 19:13:26 +03:00 |
|
|
cbb58fdf09
|
Web: Login: fix width modal aside
|
2022-01-26 19:12:44 +03:00 |
|
|
4177cd35ec
|
Web: Login: add translations
|
2022-01-26 19:11:54 +03:00 |
|
|
5169d60783
|
Web: Client: added checkedMaintenance
|
2022-01-25 20:10:54 +05:00 |
|
Timofey
|
31a8b00313
|
Merge branch 'develop' into feature/catalog
|
2022-01-25 17:35:06 +08:00 |
|
Vashchuk Nikita
|
3e03f820bb
|
async IDataStore
|
2022-01-25 12:29:11 +03:00 |
|
Timofey
|
f955bea115
|
Web:Client:Components: fixed product name color for dark and base theme
|
2022-01-25 16:32:35 +08:00 |
|
Timofey
|
f98812e233
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-25 15:04:38 +08: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 |
|
Timofey
|
ff370ebe1d
|
Web:Editor: add support dark-theme
|
2022-01-24 22:32:05 +08:00 |
|
|
1f61f4bd4c
|
Web: Client: created checkBar function
|
2022-01-24 18:49:23 +05: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 |
|
|
a66964e0b8
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/campaigns-banner
|
2022-01-21 18:46:20 +03:00 |
|
|
f7689fefe6
|
Web: add campaigns folder
|
2022-01-21 18:32:33 +03:00 |
|
Timofey
|
f2eb9be2fc
|
Web:Studio:About: inject theme in about content
|
2022-01-21 23:14:20 +08: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 |
|
Timofey
|
f5ae02dfc9
|
Merge branch 'develop' into feature/catalog
|
2022-01-21 21:06:40 +08:00 |
|
|
893c4ddc5a
|
Wen: Editor: Added a new parameter to the conversion api method.
|
2022-01-21 15:07:32 +03:00 |
|
Timofey
|
47974e378f
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-21 19:31:48 +08: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 |
|
Timofey
|
e5f06b932d
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-20 21:18:30 +08: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 |
|
|
17a06e66f2
|
Web: Client: get banners every 12h
|
2022-01-19 13:23:29 +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 |
|
|
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 |
|
|
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 |
|
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 |
|
|
0ad204743f
|
Merge branch 'develop' into feature/dark-theme
|
2021-12-29 20:25:29 +08: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 |
|
|
ad5ee66ef9
|
Web:Wizard:Components: add support dark-theme
|
2021-12-28 23:52:12 +08: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 |
|
|
9557ad7abb
|
Web:Common:Store: add array for available themes
|
2021-12-28 21:39:27 +08:00 |
|
|
0a786bbfa3
|
analizators/s4830
|
2021-12-28 15:00:48 +03:00 |
|
|
605e7eba35
|
Fix bad merge febf172875
|
2021-12-28 14:56:00 +03:00 |
|
|
2140ccff0b
|
Web:Client: add the ability to get default theme from browser theme and save it in local storage
|
2021-12-28 19:01:03 +08:00 |
|
|
febf172875
|
Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/avatar-editor/index.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/main-button/index.js
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Login/package.json
|
2021-12-28 13:35:02 +03:00 |
|
|
42411acf49
|
Web:Login: add support dark-theme
|
2021-12-28 11:27:15 +08:00 |
|
|
c78cd078cf
|
Merge pull request #481 from ONLYOFFICE/feature/redesign-start-page
Feature/redesign start page
|
2021-12-27 17:33:48 +03:00 |
|
|
657961c334
|
Web: Socket: Implemented "stop editing" + refactoring
|
2021-12-24 20:58:38 +03:00 |
|
|
d7b98e875b
|
Web:Common:Header: add support dark-theme for loader
|
2021-12-24 19:44:37 +08:00 |
|
|
eb02c96697
|
microsoft recomended store the System.Guid type as string type in protobuf format
|
2021-12-23 18:29:35 +03:00 |
|
|
6d250efffa
|
add *.dll for support redis + update Grpc.* dll
|
2021-12-23 16:17:31 +03:00 |
|
|
440811e931
|
Web: Added convertLanguage for compatibility
|
2021-12-23 14:01:08 +03:00 |
|
|
3bf412166d
|
Web: Settings: Commented old redux actions
|
2021-12-23 13:09:38 +03:00 |
|
|
919092e6c6
|
Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0
|
2021-12-23 11:28:50 +03:00 |
|
|
9e24c182c9
|
edit ko
|
2021-12-23 11:22:48 +03:00 |
|
|
86e965d779
|
Web: Fix translations
|
2021-12-22 18:12:04 +03:00 |
|
|
6fde793f14
|
Web:add opportunity change theme in profile menu
|
2021-12-22 22:22:35 +08:00 |
|
|
1d49c9dc51
|
Web: Client: Fixed spelling errors
|
2021-12-21 20:25:59 +03:00 |
|
|
ff7b6fc432
|
Web: init e2e tests
|
2021-12-21 15:59:11 +08:00 |
|
|
99e37d960d
|
Web: Socket.IO: Refactoring work with socket.io
|
2021-12-20 15:38:08 +03:00 |
|
|
156fbada6d
|
edit translations bg
|
2021-12-16 17:13:44 +03:00 |
|
|
93cbab055c
|
edit lo
|
2021-12-16 15:59:02 +03:00 |
|
|
9736c9ded8
|
Web: Socket: added redis, fixed editorCreateCopy
|
2021-12-16 15:28:01 +03:00 |
|
|
6d84bd5f04
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-15 17:22:17 +03:00 |
|
|
e09f079052
|
Web: Editor: Fixed checking key`s existing inside config
|
2021-12-15 15:40:37 +03:00 |
|
|
0244c3b924
|
Web: Editor: Restored config as param
|
2021-12-15 15:07:25 +03:00 |
|
|
bb31f7d574
|
Web: Files: refactoring socket code
|
2021-12-15 12:32:38 +03:00 |
|
|
a3e2f13e36
|
Web:Client:Shell: change theme from base to dark
|
2021-12-15 17:28:30 +08:00 |
|
gectokot
|
f2548e27ba
|
Web: Studio: Moved settings menu link from hamburger menu to profile menu
|
2021-12-14 14:47:23 +03:00 |
|
gectokot
|
e9449b5a72
|
Web: Studio: Homepage: Fixed vertical scroll appearing on mobile in landscape mode
|
2021-12-14 14:45:40 +03:00 |
|
gectokot
|
a1f0c01558
|
Web: Studio: Homepage: Fixed layout jump on load
|
2021-12-14 14:42:40 +03:00 |
|
|
b5eeac9a47
|
edit translations
|
2021-12-14 12:43:10 +03:00 |
|
gectokot
|
1ea64c8701
|
Web: Studio: Homepage: Now displayName is used in greeting message
|
2021-12-14 11:14:08 +03:00 |
|
|
4860584695
|
Web:Client:NavMenu: add support dark theme
|
2021-12-14 15:52:03 +08:00 |
|
|
6422c65841
|
Web: Files: moved openDocEditor to FilesActionsStore.js. Removed socket.js, added SocketStore
|
2021-12-13 18:42:53 +03:00 |
|
gectokot
|
8ee3ef5bd5
|
Web: Studio: Homepage: Changed logic for greeting message
|
2021-12-13 16:12:52 +03:00 |
|
gectokot
|
6f49b68f8e
|
Web: Studio: Homepage: Fixes
|
2021-12-13 15:31:23 +03:00 |
|
gectokot
|
0a53e3bd7d
|
Web: Studio: Homepage: Refactoring
|
2021-12-13 14:50:33 +03:00 |
|
|
031af716e6
|
Tfa: fix
|
2021-12-10 21:25:03 +03:00 |
|
gectokot
|
464a5cd456
|
Web: Studio: Fixed links
|
2021-12-10 20:06:03 +03:00 |
|
gectokot
|
cf5723cd53
|
Web: Studio: Renamed function isModuleOld to checkIfModuleOld
|
2021-12-10 17:31:46 +03:00 |
|
gectokot
|
d32dc40034
|
Web: Studio: Fixes, refactoring
|
2021-12-10 17:22:03 +03:00 |
|
|
055c200b60
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-12-10 16:31:29 +03:00 |
|
|
1d2750f23b
|
Web: Files: Remove privacy folders from select files/folders dialog.
|
2021-12-10 16:30:20 +03:00 |
|
gectokot
|
729e695dbc
|
Web: Studio: Moved external link icon from utils to components
|
2021-12-10 16:16:10 +03:00 |
|
gectokot
|
4e38480b73
|
Web: Studio: Homepage: Removed hamburger menu
|
2021-12-10 13:10:36 +03:00 |
|
gectokot
|
85c55cd1ea
|
Web: Studio: Homepage: Redesign
|
2021-12-10 12:24:35 +03:00 |
|
gectokot
|
49061c8e84
|
Web: Studio: Homepage: Changed title to new greeting message, swapped tiles and illustration
|
2021-12-10 10:26:13 +03:00 |
|
|
00ab71280c
|
Merge branch 'release/v1.1.0' into feature/editor-history
|
2021-12-10 09:36:12 +03:00 |
|
|
878df989d9
|
Web: Renamed folder zh_CN to zh-CN
|
2021-12-09 21:51:05 +03:00 |
|
|
0771a54c47
|
Optimization
|
2021-12-09 20:23:06 +03:00 |
|
gectokot
|
eecdc3e0b1
|
Web: Studio: Refactoring
|
2021-12-09 18:59:52 +03:00 |
|
|
ca7a0f7cb7
|
WEb: Editor: Fixed file conversion when saving to a folder and opening in an adjacent tab.
|
2021-12-09 16:16:43 +03:00 |
|
|
ed41326acc
|
Web: socket-io, first version
|
2021-12-09 15:50:50 +03:00 |
|
|
e8af856c26
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-09 13:55:55 +03:00 |
|
|
41681d0c94
|
Server: Files: Configuration: Fixed logo type for filling form mode
|
2021-12-09 12:45:52 +03:00 |
|
|
3921fa74f3
|
Web: Editor: Deleted useless imports.
|
2021-12-08 17:00:24 +03:00 |
|
|
c41937002f
|
Web: Editor: Added a condition for showing the history restore function.
|
2021-12-08 16:52:50 +03:00 |
|
|
e771000f8a
|
Web: Editor: Deleted useless code.
|
2021-12-08 16:46:09 +03:00 |
|
|
3b17a90b1b
|
Web: Editor: Fixed after cherry picking.
|
2021-12-08 16:45:12 +03:00 |
|
|
51b7921ed4
|
Web: Edit: Added doc property to api methods for history versions.
# Conflicts:
# packages/asc-web-common/api/files/index.js
|
2021-12-08 16:30:26 +03:00 |
|
|
d5a77379b3
|
Web: Editor: Added api method for restore document version.
|
2021-12-08 16:28:30 +03:00 |
|
|
aeb5121331
|
Web: Editor: Fixed displaying info.
|
2021-12-08 16:28:30 +03:00 |
|
|
3937082fc9
|
Web: Editor: Fixed object parameters of history data.
|
2021-12-08 16:28:30 +03:00 |
|
|
17129ad9d1
|
Erb: Editor: Renaming.
|
2021-12-08 16:28:30 +03:00 |
|
|
a3c4577482
|
Web: Editor: Refactoring.
|
2021-12-08 16:28:29 +03:00 |
|
|
1983d60e55
|
Web: Editor: Moved the functionality of converting history and getting the current version into separate functions.
|
2021-12-08 16:28:29 +03:00 |
|
|
944591cd4d
|
Web: Editor: Added error handler for history function.
|
2021-12-08 16:28:29 +03:00 |
|
|
71aa1eb474
|
Web: Editor: Added restore option.
|
2021-12-08 16:28:29 +03:00 |
|
|
30bd96a4c6
|
Web: Editor: Fixed opening of revisions.
|
2021-12-08 16:28:28 +03:00 |
|
|
bc8a7f3dd2
|
Web: Editor: Removed revisions from versions list.
|
2021-12-08 16:28:28 +03:00 |
|
|
70cc67b356
|
Web: Editor: Refactoring.
|
2021-12-08 16:28:28 +03:00 |
|
|
d20f833889
|
Web: Editor: Renaming.
|
2021-12-08 16:28:28 +03:00 |
|
|
d5b2b2a395
|
Web: Editor: Added error handler for history data.
|
2021-12-08 16:28:28 +03:00 |
|
|
a79db0fa25
|
Web: Editor: Added version to the history data.
|
2021-12-08 16:28:27 +03:00 |
|
|
fcb4e43d55
|
Web: Editor: Removed side effect - changes of array length.
|
2021-12-08 16:28:27 +03:00 |
|
|
a6deb7febb
|
Web: Editor: Fixed display of editing date.
|
2021-12-08 16:28:27 +03:00 |
|
|
7fd1452e81
|
Web: Editor: Fixed current version of document.
|
2021-12-08 16:28:27 +03:00 |
|
|
c6265a9cb4
|
Web: Editor: Fixed getting name and id of user for history.
|
2021-12-08 16:28:26 +03:00 |
|
|
5fa436eb21
|
Web: Editor: Fixed getting information of difference of file.
|
2021-12-08 16:28:26 +03:00 |
|
|
e3eb043c2a
|
Web: Editor: Added new api method for RequestHistory method.
|
2021-12-08 16:28:26 +03:00 |
|
gectokot
|
ed3a4c85e0
|
Web: Studio: Moved onItemClick function to utils
|
2021-12-08 15:25:19 +03:00 |
|
|
674732ee60
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-08 15:22:53 +03:00 |
|
|
8441a506af
|
add translations
|
2021-12-08 15:17:26 +03:00 |
|
gectokot
|
d0a505b844
|
Web: Studio: HomePage: ModuleTile: Added ability to open unavailable modules in a new tab
|
2021-12-08 15:17:00 +03:00 |
|
gectokot
|
2e1584f080
|
Web: Studio: HomePage: Header: Added ability to open unavailable modules in a new tab
|
2021-12-08 15:16:38 +03:00 |
|
gectokot
|
72666795aa
|
Web: Studio: Homepage: Redesign, added illustration, refactoring
|
2021-12-08 15:13:29 +03:00 |
|
gectokot
|
b35c06f56e
|
Web: Studio: Homepage: Added styles for external link icon
|
2021-12-08 15:09:57 +03:00 |
|
gectokot
|
9b604dbd57
|
Web: Studio: Homepage: Added helper functions for links
|
2021-12-08 15:09:19 +03:00 |
|
gectokot
|
0ab444b34e
|
Web: Studio: Homepage: Moved sub components to sub-components folder
|
2021-12-08 15:06:32 +03:00 |
|
gectokot
|
dc621dac89
|
Web: Studio: Homepage: Added SVG illustration
|
2021-12-08 15:04:14 +03:00 |
|
|
c87a831b89
|
Files: optimization
|
2021-12-08 13:14:44 +03:00 |
|
|
2187cb5331
|
edit lv
|
2021-12-08 12:24:54 +03:00 |
|
|
475dd92c30
|
Web: Editor: Fixed history information.
|
2021-12-08 09:37:40 +03:00 |
|
|
6d96855e79
|
Web: Editor: Added list of history and possibility to close history.
# Conflicts:
# web/ASC.Web.Editor/src/Editor.jsx
|
2021-12-08 09:37:02 +03:00 |
|
|
bdcb4cd0be
|
moved from 51eb3d88
|
2021-12-07 16:56:16 +03:00 |
|
|
20a17fca96
|
rename pt
|
2021-12-07 16:50:09 +03:00 |
|
|
f9c92a6bd7
|
edit pt_PT
|
2021-12-07 12:40:49 +03:00 |
|
|
3607a54cd2
|
edit vi
|
2021-12-07 10:38:03 +03:00 |
|
|
7973639195
|
edit vi
|
2021-12-07 10:37:30 +03:00 |
|
|
ee935ec401
|
edit az
|
2021-12-06 18:21:35 +03:00 |
|
|
f8bdd48db8
|
add pt_PT
|
2021-12-06 18:21:13 +03:00 |
|
|
6ef7c23bac
|
add pt_PT
|
2021-12-06 18:20:48 +03:00 |
|
|
0952d01250
|
add uk
|
2021-12-06 17:29:41 +03:00 |
|
|
9126ea393d
|
add uk
|
2021-12-06 17:29:19 +03:00 |
|
|
40c5a0d6b2
|
add az
|
2021-12-06 17:11:54 +03:00 |
|
|
4fef520aba
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-06 15:09:57 +03:00 |
|
|
d0a4cee8ef
|
edit translations
|
2021-12-06 13:05:56 +03:00 |
|
|
a059fc9b7c
|
edit translations
|
2021-12-06 13:05:31 +03:00 |
|
|
af2e95dfd7
|
edit cs
|
2021-12-06 11:28:11 +03:00 |
|
|
086cc8efd2
|
Web: Fixed format of searchParam for files selector
|
2021-12-03 18:41:57 +03:00 |
|
|
e60c082a1d
|
Web: Client: fixed position profile menu drop down
|
2021-12-02 18:58:43 +05:00 |
|
|
3a50fca3cc
|
Merge branch 'hotfix/v1.1.1' into bugfix/dropdown-correct-display
|
2021-12-02 18:32:36 +05:00 |
|
|
a012038f3b
|
Merge branch 'develop' into feature/catalog
|
2021-12-02 14:59:31 +08:00 |
|
|
edff6e2f40
|
update pl
|
2021-12-01 18:32:54 +03:00 |
|
|
bc58174a89
|
update pl
|
2021-12-01 18:13:16 +03:00 |
|
|
e1b0164bd3
|
update cs
|
2021-12-01 18:04:36 +03:00 |
|
|
00f2e1821e
|
edit cs
|
2021-12-01 18:03:54 +03:00 |
|
|
0ba91e0100
|
update cs
|
2021-12-01 17:54:46 +03:00 |
|
|
870f05fc83
|
add el
|
2021-12-01 17:42:50 +03:00 |
|
|
e4ee37660e
|
update el
|
2021-12-01 17:40:56 +03:00 |
|
|
50a4added2
|
update el
|
2021-12-01 17:40:27 +03:00 |
|
|
a17e301cde
|
update bg
|
2021-12-01 14:36:33 +03:00 |
|
|
7823b9804c
|
update bg
|
2021-12-01 14:36:04 +03:00 |
|
|
1ea835b0bf
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-01 12:05:51 +03:00 |
|
|
27e732e9a3
|
Web: Login: Added usage of new API /authentication.json parameter "session"
|
2021-12-01 10:56:50 +03:00 |
|
|
626191c5d7
|
Core: fixed session
|
2021-11-30 22:16:23 +03:00 |
|
|
39b10cf7b1
|
edit ro
|
2021-11-30 17:20:47 +03:00 |
|
|
d5d87a679f
|
update translations
|
2021-11-30 12:35:00 +03:00 |
|
|
77f86fccdb
|
update translations
|
2021-11-30 12:31:54 +03:00 |
|
|
4c78667a99
|
fix Bug 52493 - Welcome page. notify «User with this email is already registered»
|
2021-11-30 12:09:51 +03:00 |
|
|
b2c123d6f4
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-11-30 11:46:22 +03:00 |
|
|
a032b83a32
|
Web: Editor: Optimization - Removing unnecessary api requests.
|
2021-11-30 10:59:41 +03:00 |
|
|
43d04b28de
|
edit uk
|
2021-11-29 15:27:40 +03:00 |
|
|
5a5169b391
|
edit cz
|
2021-11-29 15:22:40 +03:00 |
|
|
bbe874054e
|
update translations
|
2021-11-29 12:37:32 +03:00 |
|
|
cecfc406c5
|
Auth: added session param
|
2021-11-26 21:59:39 +03:00 |
|
|
d297fa0dd1
|
fix Bug 52071
|
2021-11-26 21:36:51 +03:00 |
|
|
04a56e57cb
|
Web: Editor: Fixed bug with starting api calls before getting file id
|
2021-11-26 13:48:15 +03:00 |
|
|
18d0cd0842
|
Web: Shell: Fix minimization on production build static
|
2021-11-25 17:39:25 +03:00 |
|
|
384e012c5f
|
net 6: remove TryUseWindowsService
|
2021-11-25 16:48:08 +03:00 |
|
|
bce51d74b6
|
Fix Bug 53438 - Client.Editor. Added redirect to homepage due to error
|
2021-11-25 16:37:36 +03:00 |
|
|
08746974f4
|
Web: SW: Added SW unregister + refactoring
|
2021-11-25 15:08:18 +03:00 |
|
|
ff9bb93efd
|
Web: Scripts: Hide shx mkdir errors
|
2021-11-25 15:06:19 +03:00 |
|
|
58d84912dd
|
fix
|
2021-11-25 11:23:35 +03:00 |
|
|
038cf92a91
|
ApiSystemHelper: fix check
|
2021-11-25 11:00:17 +03:00 |
|
|
13e13f2303
|
Net: fix requests
|
2021-11-24 22:34:39 +03:00 |
|
|
fcb6723d1f
|
Fixed Bug 53502 - Client.Editor.Added message about locked file.
|
2021-11-24 14:12:47 +03:00 |
|
|
b74e4ccfd1
|
Removed unused dependencies. Fixed tests
|
2021-11-24 12:39:39 +03:00 |
|
|
465c57b8f6
|
Fixed Bug 54013 - Client.Files.Returned the ability to select elements on the About program page.
|
2021-11-24 11:09:52 +03:00 |
|
|
59c88e2006
|
up to 6.0.0
|
2021-11-23 17:56:27 +03:00 |
|
|
8ca88e4620
|
Merge branch 'develop' into feature/net6
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Common/ASC.Common.csproj
# products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Server/ASC.Files.csproj
# web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
|
2021-11-23 16:40:50 +03:00 |
|
|
3417cb28f4
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-22 11:25:49 +03:00 |
|
|
b632f3a623
|
Web: Fixed styles according layouts, renaming.
|
2021-11-22 10:15:24 +03:00 |
|
|
11d527ba03
|
Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
|
2021-11-21 14:40:24 +03:00 |
|
|
f675415228
|
Merge branch 'master' into release/v1.1.0
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/en/SelectFolder.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/public/locales/en/Translations.json
# products/ASC.People/Client/public/locales/ru/Translations.json
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
|
2021-11-21 14:26:20 +03:00 |
|
|
d31ea87211
|
Merge branch 'master' into develop
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
|
2021-11-21 13:57:55 +03:00 |
|
|
4cd9d042de
|
Web: Files: fixed styles after Cherry picking.
|
2021-11-19 16:58:31 +03:00 |
|
|
2eb6843e46
|
Web: Editor: Added conditions for creating a file in my documents folder when filling out a form.
|
2021-11-19 10:28:57 +03:00 |
|
|
cc35174d16
|
moved from 043e301
|
2021-11-16 20:40:15 +03:00 |
|
|
2c6e0d45bc
|
Web: Fix wrong braces of variables inside translation files
|
2021-11-13 19:07:48 +03:00 |
|
|
c7c7267a9a
|
Test: Added new WrongTranslationVariablesTest and fix it's issues
|
2021-11-13 19:03:10 +03:00 |
|
|
623313e4be
|
Web: Restored missing 'ru' translations
|
2021-11-12 21:14:44 +03:00 |
|
|
5ff07a8293
|
Web: Fix UselessTranslationKeysTest translation issues
|
2021-11-12 20:46:04 +03:00 |
|
|
d8cf12f9d7
|
translations
|
2021-11-12 19:00:01 +03:00 |
|
|
17e3e5cb98
|
bump version to 1.1.1
|
2021-11-12 15:21:25 +03:00 |
|
|
3809273075
|
bump version to 1.1.0
|
2021-11-12 15:19:40 +03:00 |
|
|
fc42416fea
|
fix config
|
2021-11-12 10:57:12 +03:00 |
|
|
2ea63910a2
|
Web: Added encoding/decoding operations for string file ids. Fixed errors with opening folders and files with string id s
|
2021-11-11 15:37:23 +03:00 |
|
|
11769e8c9e
|
Fix Bug 53180 - Client: Profile. Error «.../pt/Common.json 404» on pt-BR language.
|
2021-11-10 19:59:03 +03:00 |
|
|
e917b4bb56
|
Fix Bug 53454 - Client: Sign out. Error on api/2.0/people/@self.json
|
2021-11-10 15:52:36 +03:00 |
|
|
cd897aa8f1
|
Web: About: Fix DublicatesByContentTest translation issue
|
2021-11-08 15:33:27 +03:00 |
|
|
a876ce8b67
|
Web:Common:PageLayout: add catalog in readme and storybook
|
2021-11-08 17:23:56 +08:00 |
|
|
baccb134a6
|
Web: Refactoring asyn/promise calls
|
2021-11-03 18:35:15 +03:00 |
|
|
3ebff769b1
|
Web: Login: Fixed login function for desktop client
|
2021-11-03 12:19:28 +03:00 |
|
|
eb1db9eea6
|
Merge branch 'hotfix/v1.0.1' into feature/desktop-login
|
2021-11-02 18:15:53 +03:00 |
|
|
dd89318a40
|
Web: People: Profile: Fixed serialized profile property
|
2021-11-02 18:12:15 +03:00 |
|
|
d37aa52f09
|
Merge branch 'develop' into feature/catalog
|
2021-11-02 21:04:46 +08:00 |
|
|
aa79ef2c9d
|
Merge branch 'hotfix/v1.0.1' into feature/desktop-login
|
2021-11-02 14:03:26 +03:00 |
|
|
4e018d2d71
|
Web: Bump version to 1.0.1
|
2021-11-02 14:02:46 +03:00 |
|
|
8cc08045b7
|
Merge branch 'master' into develop
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-header.js
# 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
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
|
2021-11-01 13:54:40 +03:00 |
|
|
d1fe0950a1
|
Web: AutoBackup: Added disable use of buttons at the time of saving, refactoring.
|
2021-11-01 12:20:40 +03:00 |
|
|
7b083aad4b
|
Web: Refactoring, fixed non-update stateю
|
2021-11-01 11:27:21 +03:00 |
|
|
cafbe52e7b
|
Web: Backup: Optimization.
|
2021-11-01 11:26:25 +03:00 |
|
|
28cb2e5519
|
Web: Deleted disabling cancel button.
|
2021-11-01 11:26:02 +03:00 |
|
|
6dadf809bf
|
Web: Backup: Fixed translation.
|
2021-10-29 17:13:02 +03:00 |
|
|
94d0cd1afd
|
Web: Refactoring.
|
2021-10-29 16:13:31 +03:00 |
|
|
59eee87d55
|
Web: Backup: Deleted useless code.
|
2021-10-29 15:32:24 +03:00 |
|
|
aa165a7098
|
Web: Added common styles.
|
2021-10-29 14:25:06 +03:00 |
|
|
3eaff28c47
|
Web: Fixed month and weekday options.
|
2021-10-29 14:12:26 +03:00 |
|
|
300791d509
|
Web: Deleted useless code.
|
2021-10-29 14:11:51 +03:00 |
|
|
26511d9fb7
|
Merge branch 'develop' into feature/webhooks
# Conflicts:
# ASC.Tests.sln
|
2021-10-29 13:18:57 +03:00 |
|
|
33fa8b9dc8
|
Web: Fixed day of month.
|
2021-10-29 11:55:00 +03:00 |
|
|
3c25ee55b3
|
Auth: temp fix for plugin
|
2021-10-28 20:14:20 +03:00 |
|
|
424c536ecf
|
Web: RestoreBackup: Fixed styles.
|
2021-10-28 17:18:33 +03:00 |
|
|
ffa27f357e
|
Web: Fixed import
|
2021-10-28 17:18:10 +03:00 |
|
|
3d8a4a1a22
|
Web: Refactoring.
|
2021-10-28 16:26:00 +03:00 |
|
|
d114f5c9c6
|
Web: RestoreBackup: Renamed files.
|
2021-10-28 16:23:02 +03:00 |
|
Artem Tarasov
|
8c6a3f9fcd
|
Web: Editor/Login: changed the way to save the link from sessionStorage to localStorage
|
2021-10-28 13:32:23 +03:00 |
|
|
07c5dcf5ec
|
Web: Refactoring.
|
2021-10-28 12:17:01 +03:00 |
|
|
33245ac05d
|
Web: Bakup: Optimization, added a flag about the ability to show the automatic backup moduleю
|
2021-10-28 12:15:52 +03:00 |
|
|
0215599566
|
merge from develop
|
2021-10-27 19:37:12 +03:00 |
|
|
c0ea857dbf
|
Merge pull request #435 from ONLYOFFICE/bugfix/Bug-53050
Web: Editor/Login: fixed bug 53050: fixed redirect to editors after l…
|
2021-10-27 18:54:08 +03:00 |
|
Artem Tarasov
|
82e136b0e0
|
Web: Login: fixed remove key from session storage
|
2021-10-27 18:09:46 +03:00 |
|
|
25d5e0f41f
|
Web: AutoBackup: Fixed error handler.
|
2021-10-27 17:16:33 +03:00 |
|
|
f5d5e92fb8
|
Web: Client: Added redirect to default page for personal
|
2021-10-27 17:13:03 +03:00 |
|
Artem Tarasov
|
e42b09d025
|
Web: Editor/Login: fixed bug 53050: fixed redirect to editors after login when following a direct link to editors
|
2021-10-27 16:48:09 +03:00 |
|
|
184975e729
|
Web: RestoreBackup: Fixed redirect to preparation page when restore from backup list.
|
2021-10-27 15:53:01 +03:00 |
|
|
f6e362d9b5
|
Web: Files: RestoreBackup: Disabled restore button when is restoring process.
|
2021-10-27 15:29:14 +03:00 |
|
|
e1a7d5f256
|
Web: Refactoring, added error handlers.
|
2021-10-27 14:20:44 +03:00 |
|
|
29ee1eabc6
|
Web: PreparationPortal: Added error message.
|
2021-10-27 13:34:56 +03:00 |
|
|
86eb4533d9
|
Web :Files: fixed translation.
|
2021-10-25 15:11:46 +03:00 |
|
|
ffe9049e3f
|
Web: Files: Fixed styles.
|
2021-10-25 15:06:56 +03:00 |
|
|
403388fbf1
|
Added solution filter
Removed unused services
replaced sh with bat
start service from source
|
2021-10-25 14:29:36 +03:00 |
|
|
09897ffc2b
|
net6: warning SYSLIB0014
|
2021-10-25 14:03:14 +03:00 |
|
|
8ba2f0c694
|
Merge branch 'develop' into feature/backup
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# web/ASC.Web.Api/Models/SettingsWrapper.cs
|
2021-10-25 11:02:42 +03:00 |
|
|
e5e4a89e5b
|
Merge branch 'develop' into feature/net6
|
2021-10-22 16:10:37 +03:00 |
|
|
e310d5e655
|
net6: httpClient: add using
|
2021-10-21 17:56:31 +03:00 |
|
|
f6f317ec42
|
net6: refactoring and bugfix
|
2021-10-21 16:23:26 +03:00 |
|
|
657e34d474
|
Web:Studio:NavMenu: fix showing navigation icons
|
2021-10-21 20:36:25 +08:00 |
|
|
9aa3fd7047
|
Web:Common:Catalog: update branch
|
2021-10-20 22:31:39 +08:00 |
|
|
7d511385bc
|
removed unused references
|
2021-10-19 19:08:47 +03:00 |
|
|
5a5e299d98
|
Merge branch 'develop' into feature/webhooks
# Conflicts:
# ASC.Web.sln
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
|
2021-10-19 18:30:59 +03:00 |
|
|
4bd4954ad4
|
Merge branch 'release/1.0.0' into feature/desktop-login
|
2021-10-19 13:10:47 +03:00 |
|
|
7481f3a2d0
|
Merge branch 'develop' into feature/catalog
|
2021-10-19 15:51:12 +08:00 |
|
|
b6461e46f4
|
net6: replacing System.Drawing with ImageSharp
|
2021-10-18 14:24:05 +03:00 |
|
|
1803681aef
|
Web: Backup: Renamed files.
|
2021-10-16 18:52:58 +03:00 |
|
|
f98e866571
|
Web: Settings: Renamed files.
|
2021-10-16 18:50:02 +03:00 |
|
|
be77a8231b
|
Web: Settings: ManualBackup: Canceled switching to a new tab when downloading a backup.
|
2021-10-16 18:46:34 +03:00 |
|
|
c5ebdb333b
|
Web: settings: Renamed manual backup.
|
2021-10-16 18:44:04 +03:00 |
|
|
17628fd641
|
Web: Settings: AutoBackup: Added correct allocation of the maximum number of copies.
|
2021-10-16 18:42:24 +03:00 |
|
|
58fce28bf5
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-10-15 16:53:45 +05:00 |
|
|
7c9980b475
|
Web: Removed index from remoteEntry url (disk cache issue)
|
2021-10-15 12:49:15 +03:00 |
|
|
9c7207dfe3
|
Web:Studio:Header: fixed badge style
|
2021-10-15 17:19:28 +08:00 |
|
|
fb7922f579
|
Thirdparty: login. Desktop
|
2021-10-15 11:34:34 +03:00 |
|
|
bc37fcc8ce
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-10-14 16:06:55 +05:00 |
|
|
6947adcfc8
|
Personal: fix quota
|
2021-10-14 13:47:12 +03:00 |
|
|
cc73e8592c
|
Web: AutoBackup: fixed schedule styles.
|
2021-10-14 12:08:26 +03:00 |
|
|
0748119818
|
Web: AutoBackup: Renamed file, fixed styles.
|
2021-10-14 11:51:29 +03:00 |
|
|
2275ffdae5
|
Web: AutoBackup: Refactoring.
|
2021-10-14 11:07:40 +03:00 |
|
|
d85e464be3
|
Web: AutoBackup: Renamed files.
|
2021-10-14 11:05:20 +03:00 |
|
|
f74fc731af
|
Web: AutoBackup: Transferring files to a shared folder
|
2021-10-14 11:00:38 +03:00 |
|
|
7ad6891976
|
WEb: AutoBackup: Renamed files.
|
2021-10-14 10:28:49 +03:00 |
|
|
e6fade3507
|
Web: ManualBackup: Deleted useless prop.
|
2021-10-14 10:26:11 +03:00 |
|
|
07cb12a312
|
Web: AutoBackup: Added ThirdPartyStorage module, refactoring.
|
2021-10-14 10:24:35 +03:00 |
|
|
8033b74ecd
|
Web: Editor: Hide loader on onSDKAppReady
|
2021-10-13 16:28:40 +03:00 |
|
|
ab6932113c
|
Web: Editor: Replaced loader
|
2021-10-13 16:14:35 +03:00 |
|
|
1c38f29440
|
Web: Added new logo files and setup is_retina cookie for better icons inside Editor on retina resolution
|
2021-10-13 15:19:31 +03:00 |
|
|
735a9b60cf
|
net6: warning CA1416
also remove unnecessary usings
|
2021-10-13 11:07:03 +03:00 |
|
|
66d126410c
|
Login: added desktop param
|
2021-10-13 10:25:19 +03:00 |
|
|
6e4e3d69aa
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-10-12 20:26:45 +05:00 |
|
|
ae9a3187bc
|
net6: warning SYSLIB0014
|
2021-10-12 13:14:33 +03:00 |
|
|
a1a4818136
|
Web: Fix Bug 53050: 404 on primary file link after logout
|
2021-10-12 12:10:09 +03:00 |
|
|
284a26be3d
|
Web: AutoBackup: Disabled button when process copying.
|
2021-10-11 10:07:52 +03:00 |
|
|
9b2596fe91
|
Web: Changed logic according to layouts.
|
2021-10-11 09:40:54 +03:00 |
|
|
0badca9ea3
|
Added new translation.
|
2021-10-11 09:38:32 +03:00 |
|
|
72b19da283
|
Files: fix requests
|
2021-10-08 12:49:29 +03:00 |
|
|
801c5ff561
|
Merge pull request #389 from ONLYOFFICE/feature/editor-edit-button
Web: Editor: Added edit editor button.
|
2021-10-07 19:26:36 +03:00 |
|
|
14fd3c82f5
|
Web: Deleted useless code.
|
2021-10-07 19:18:55 +03:00 |
|
|
1ee16ce600
|
Web: Editor: Added error handler.
|
2021-10-07 19:05:31 +03:00 |
|
|
659a5a409b
|
Web: Editor: Fixed url after converting.
|
2021-10-07 19:04:22 +03:00 |
|
|
b8f77d4a29
|
Web: Editor: Added edit editor button.
|
2021-10-07 18:31:45 +03:00 |
|
|
31570e57d7
|
Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row
|
2021-10-07 17:47:54 +03:00 |
|
|
335c580d78
|
Web: Dev: Downgrade lerna to v3.22.1 and update webpack-dev-server and webpack-cli (yarn start + Ctrl-C stop issue)
|
2021-10-07 17:32:32 +03:00 |
|
|
b0fe6bd9e2
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-10-07 15:17:04 +03:00 |
|
|
7a380542aa
|
net6: warning SYSLIB0023
|
2021-10-07 12:00:26 +03:00 |
|
|
deffb0c901
|
Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row
|
2021-10-06 21:01:53 +03:00 |
|
|
5dbf54c2b3
|
Web: Fix open '/Products/Files' and '/Products/Files/?desktop=true' (desktop provider 'onlyoffice' issue)
|
2021-10-06 20:52:22 +03:00 |
|
|
d83a400e0c
|
Web: Restore: Added changing the height of the content of the modal dialog depending on the number of lines.
|
2021-10-06 18:15:21 +03:00 |
|
|
a33d49f356
|
Web: Files: fixed icons, fixed styles
|
2021-10-06 15:23:12 +03:00 |
|
|
4dc7977ec7
|
Web:Studio:NavMenu: deleted comments
|
2021-10-06 20:07:32 +08:00 |
|
|
435cf08f30
|
Web:Studio:NavMenu: fixed tablet view
|
2021-10-06 18:09:45 +08:00 |
|
|
d4fd6c470d
|
Web:Studio:NavMenu: deleted console log
|
2021-10-06 18:01:37 +08:00 |
|
|
a7f676e92d
|
Web:Studio: edited nav menu v1.2.1
|
2021-10-06 17:58:57 +08:00 |
|
|
edd967de76
|
Web:Studio: edited nav menu v1.2.1
|
2021-10-06 17:58:09 +08:00 |
|
|
aa66baf2b6
|
Web: Client: fixed header logo
|
2021-10-06 12:36:42 +03:00 |
|
|
55cb1e875e
|
Web: fixed header height
|
2021-10-06 12:22:28 +03:00 |
|
|
539a0fe3be
|
Web: Restore: cChanging the backup list component to fit the layout.
|
2021-10-05 19:56:38 +03:00 |
|
|
3123d79138
|
Web: Fixed schedule styles.
|
2021-10-05 19:31:43 +03:00 |
|
|
c12d4b2f84
|
Web: Fixed schedule styles.
|
2021-10-05 19:29:15 +03:00 |
|
|
0b9752529f
|
Web: Fixed translation.
|
2021-10-05 19:27:22 +03:00 |
|
|
80fb5a739b
|
Web: Fixed components styles.
|
2021-10-05 19:23:30 +03:00 |
|
|
37094d5f90
|
Web: AutoBackup: Added constants.
|
2021-10-05 19:22:41 +03:00 |
|
|
c82b931cc6
|
Web: Changed constants.
|
2021-10-05 19:20:21 +03:00 |
|
|
4d67a29955
|
Web: Settings: Added translation.
|
2021-10-05 19:13:10 +03:00 |
|
|
4a16633734
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-10-05 18:14:15 +05:00 |
|
|
ed20953d9c
|
Web: Hide warning overlay
|
2021-10-05 14:57:42 +03:00 |
|
|
5d3d8f4d45
|
Web: Changed opportunity to show/hide DebugInfo to appsettings.json param "debug-info:enabled" and 'api/2.0/settings.json'
|
2021-10-05 11:13:38 +03:00 |
|
|
159e284dd0
|
Web: Added opportunity to show/hide debug info
|
2021-10-05 09:56:59 +03:00 |
|
|
6e926eceb9
|
Web: Removed browserslist (loading bundle issues)
|
2021-10-05 09:48:08 +03:00 |
|
|
ee4b6de3ff
|
Web: Optimizated debuginfo.md loading
|
2021-10-04 19:43:38 +03:00 |
|
|
dec1c42b71
|
Web: Fix dialog content height
|
2021-10-04 19:37:01 +03:00 |
|
|
9ce696e624
|
Web: Studio: Init Debug Info
+ Added About version from package.json
+ Fix DocumentServer version
|
2021-10-04 17:08:03 +03:00 |
|
|
01879779cd
|
Merge branch 'develop' into feature/backup
|
2021-10-04 15:21:45 +03:00 |
|
|
027e01ce71
|
Api: fix document server version
|
2021-10-03 14:50:33 +03:00 |
|
|
4d181ec81a
|
Web: Refactoring, deleted useless code.
|
2021-10-02 18:34:59 +03:00 |
|
|
db9ab26bd2
|
Web: ManualBackup: Added common components for the storage module, refactoring.
|
2021-10-02 18:22:59 +03:00 |
|
|
ea2a7ab590
|
Web: AutoBackup: Cancel error after saving.
|
2021-10-02 18:10:12 +03:00 |
|
|
4e2738d0eb
|
Web: AutoBackup: Added common components for the storage module, refactoring.
|
2021-10-02 18:04:25 +03:00 |
|
|
33a06ab3e6
|
Web: Restore: Disabled path input.
|
2021-10-02 14:19:29 +03:00 |
|
|
c7ea8190e5
|
Web: Restore: Added logic for storages module.
|
2021-10-02 14:16:32 +03:00 |
|
|
8ea0af3e14
|
Web: Сommon code for storages is moved to a separate folder
|
2021-10-02 14:14:10 +03:00 |
|
|
10d4bbdfd9
|
Web: Fixed property after merge.
|
2021-10-01 20:27:00 +03:00 |
|
|
c4029bcd08
|
Web: Restore: Deleted useless code.
|
2021-10-01 20:26:27 +03:00 |
|
|
171c661bc1
|
Web: Restore: Added Google Cloud Storage.
|
2021-10-01 20:25:53 +03:00 |
|
|
97f792014c
|
Web: Fixed restore styles.
|
2021-10-01 14:05:40 +03:00 |
|
|
361a9deea0
|
Web: Restore: Refactoring.
|
2021-10-01 13:38:01 +03:00 |
|
|
6988c4f997
|
net6: warning SYSLIB0021
|
2021-10-01 13:28:15 +03:00 |
|
|
0f833ae1de
|
net6: warning SYSLIB0020
|
2021-10-01 13:26:36 +03:00 |
|
|
c9e58f197a
|
Web: Added width input for restore backup.
|
2021-10-01 13:19:50 +03:00 |
|
|
e0fd051b12
|
Web: Fixed restore styles.
|
2021-10-01 12:59:34 +03:00 |
|
|
edb92c156e
|
Web: Fixed description styles of modules.
|
2021-10-01 12:47:28 +03:00 |
|
|
de790aace7
|
Web: Deleted useless code.
|
2021-10-01 12:35:35 +03:00 |
|
|
da05a2c8a6
|
Web: Separating styles for modules.
|
2021-10-01 12:34:53 +03:00 |
|
|
7bd43d92c6
|
Web: Files: Refactoring.
|
2021-10-01 12:15:19 +03:00 |
|
|
ec13120919
|
Web: ManualBackup: Changed styles according to layouts
|
2021-10-01 11:50:44 +03:00 |
|
|
53c77f5214
|
Files: fix startedit
|
2021-10-01 11:04:19 +03:00 |
|
|
03774e3500
|
Merge pull request #364 from ONLYOFFICE/bugfix/insert-editor-image
Bugfix/insert editor image
|
2021-09-30 19:27:32 +03:00 |
|
|
912b9661c1
|
Web: Refactoring.
|
2021-09-30 18:31:18 +03:00 |
|
|
fdeab37e01
|
Fix bug 52874: letters instead of avatar
|
2021-09-30 18:19:14 +03:00 |
|
|
b36f141cfb
|
Web:Common: fixed catalog on big screen tablet or mobile
|
2021-09-30 17:05:04 +08:00 |
|
|
4aa710a833
|
Fix Bug 52850: Added image replacement.
|
2021-09-30 11:51:22 +03:00 |
|
|
2c56a3af90
|
Web: Restore backup: Refactoring after mergeю
|
2021-09-30 10:06:58 +03:00 |
|
|
57804746a5
|
Web: Restore backup: Refactoring after merge.
|
2021-09-30 09:42:06 +03:00 |
|
|
e5807a43fc
|
Merge develop branch
|
2021-09-29 20:52:55 +08:00 |
|
|
6c37ac8f4b
|
Web: Deleted useless code.
|
2021-09-29 15:38:04 +03:00 |
|
|
274efac9fc
|
Web: Deleted useless code.
|
2021-09-29 13:00:27 +03:00 |
|
|
3290f6592b
|
Web: Optimization, refactoring.
|
2021-09-29 11:45:07 +03:00 |
|
|
4c9fbcf4a2
|
Web: Added session saving for the selected storage, refactoring.
|
2021-09-29 11:18:49 +03:00 |
|
|
74dea7829f
|
Web: Renamed files.
|
2021-09-28 19:27:12 +03:00 |
|
|
4d986ac3e5
|
Web: Added folder for third party storages.
|
2021-09-28 19:15:21 +03:00 |
|
|
152b3fa43c
|
Web: Created a reusable generic error function for storages.
|
2021-09-28 19:11:15 +03:00 |
|
|
8082cc23b7
|
Web: Refactoring.
|
2021-09-28 18:12:08 +03:00 |
|
|
e23f8945e0
|
Web: Added constants.
|
2021-09-28 18:10:27 +03:00 |
|
|
14279575c6
|
Web: Renamed function.
|
2021-09-28 17:57:51 +03:00 |
|
|
fcb6e86f73
|
Web: Renamed function.
|
2021-09-28 17:56:02 +03:00 |
|
|
b8ff015632
|
Web: Created a reusable generic copy function for storages.
|
2021-09-28 17:53:26 +03:00 |
|
|
6b1aaca6b6
|
Web: Deleted useless code.
|
2021-09-28 15:55:40 +03:00 |
|
|
6476204040
|
Web: Created a reusable generic copy function for modules.
|
2021-09-28 15:51:55 +03:00 |
|
|
97b6fdc6e7
|
Bug 51393 - Personal: Security. There is possible to know email registered users with help "Signup"
|
2021-09-28 15:17:06 +03:00 |
|
|
c6041b1972
|
Web: Fixed showing files list row for backup list, removed checkbox for backup list.
|
2021-09-28 13:42:52 +03:00 |
|
|
74f422ac75
|
Merge branch 'develop' into release/1.0.0
|
2021-09-27 16:09:43 +03:00 |
|
|
6591080403
|
Fix Bug 52797 with unsupported browsers. Added new packages/browserslist-config-asc with browserlist.config.js
|
2021-09-27 16:04:37 +03:00 |
|
|
a5c57fea52
|
Web: added catalog layout and document catalog
|
2021-09-27 20:59:37 +08:00 |
|
|
d2760c26b1
|
Fix Bug 52778 - Client.Editor.‘Image URL is incorrect’ when pasting an image from the repository.
|
2021-09-27 12:51:11 +03:00 |
|
|
590db7bb67
|
Merge pull request #347 from ONLYOFFICE/feature/third
Feature/third
|
2021-09-27 12:35:07 +03:00 |
|
Artem Tarasov
|
ae64556bb0
|
web: common/people/login: renamed providers to lowercase (client)
|
2021-09-27 09:55:44 +03:00 |
|
|
4531d38e6f
|
Web: Removed duplicates
|
2021-09-24 21:18:50 +03:00 |
|
|
90bb2ef44a
|
fixed bearer
|
2021-09-24 12:08:10 +03:00 |
|
|
844b996a66
|
Web: Client: fixed window height for IOS (Firefox, Safari)
|
2021-09-22 16:37:11 +03:00 |
|
|
e87329f2d3
|
Fixed Bug 52646 - iOS.Docs.Mobile. Fixed the type of device for the editor
|
2021-09-21 12:17:26 +03:00 |
|
|
aa6c02b190
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Controllers/BackupController.cs
# packages/asc-web-common/api/settings/index.js
# packages/asc-web-common/components/PrivateRoute/index.js
# packages/asc-web-common/store/SettingsStore.js
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/ru/SelectFile.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.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.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/Shell.jsx
|
2021-09-20 16:26:34 +03:00 |
|
|
b75940fe49
|
fix
|
2021-09-17 18:18:34 +03:00 |
|
|
737efc3be7
|
Api: settings. Added recapthca public key
|
2021-09-17 17:57:22 +03:00 |
|
|
6233ab55a3
|
Personal: added register method
|
2021-09-17 17:32:37 +03:00 |
|
|
b1a82ab253
|
Fix Bug 52610: Client.Clouds.Favorite.Editor.The file is not added to Favorites from the editor in folders of third-party storages.
|
2021-09-16 18:37:26 +03:00 |
|
|
15e7cf9bfd
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-09-16 12:28:20 +05:00 |
|
|
b88a6f5ddf
|
Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-15 15:56:28 +03:00 |
|
|
1f5554c748
|
Web: Shell: Fix bad merge
|
2021-09-15 15:56:15 +03:00 |
|
|
3c77982f4a
|
Fix Bug 51819 Web: Editor. Fixed openEdit
|
2021-09-15 14:52:36 +03:00 |
|
|
1ca554f82d
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# packages/asc-web-components/campaigns-banner/index.js
# web/ASC.Web.Client/src/Shell.jsx
|
2021-09-15 14:45:33 +03:00 |
|
|
8857702fcb
|
Web: Client: fix open profile
|
2021-09-15 13:59:48 +03:00 |
|
|
b92deb5391
|
Web: Shell: Added key to login route
|
2021-09-15 11:49:20 +03:00 |
|
|
03d8d560ba
|
Web: Hide internal login from personal mode
|
2021-09-14 16:44:39 +03:00 |
|
|
11dfddb031
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-09-14 18:33:01 +05:00 |
|
|
8835570193
|
Settings: added param withpassword
|
2021-09-13 15:42:09 +03:00 |
|
|
fe6014a440
|
Web: Update webpack to v5.52.1
|
2021-09-13 15:08:48 +03:00 |
|
|
6cea372119
|
Fix Bug 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries.
|
2021-09-13 13:48:30 +03:00 |
|