Commit Graph

8194 Commits

Author SHA1 Message Date
80194bb222 Web:Studio:Changed setMailDomainSettings, setLifetimeAuditSettings. Added setDNSSettings, getAuditTrailReport to SettingsSetupStore. 2022-03-03 16:05:52 +03:00
9c98b70686 Web: Login: add loader 2022-03-03 13:13:56 +03:00
5a355090dd Web: Login: add loader 2022-03-03 13:08:56 +03:00
f161598193 Merge branch 'feature/login-redesign' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-03-03 12:54:59 +03:00
6822fafda0 Web: Login: fix buttons width 2022-03-03 12:47:20 +03:00
6102b15c6d Web: Login: fix dialog 2022-03-03 12:44:09 +03:00
03d8f803cd Web:Studio:Encoding images in base64 format. Checking the save White label method when loading an image. 2022-03-03 10:22:19 +03:00
2978adcdf3 Merge branch 'develop' into feature/virtual-rooms-1.2 2022-03-02 18:18:05 +03:00
1abe5f4122 Merge branch 'develop' into feature/login-redesign 2022-03-02 18:15:03 +03:00
1ce9b25093 Web: Campaigns: Added more locales 2022-03-02 17:43:10 +03:00
Timofey Boyko
48ad201583 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-02 11:57:20 +03:00
Timofey Boyko
fdd1975a3a Web:Client: fix double settings item in user actions 2022-03-02 11:56:17 +03:00
Timofey Boyko
02b225b78b Web:Client: fix double navigation icon 2022-03-02 11:54:39 +03:00
ea9a0c5703 Web:Studio:Added theme for links in WhiteLabel component. 2022-03-02 11:43:59 +03:00
2309bc060f Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-02 11:25:08 +03:00
f2505f7575 Web:Studio:Added layout to the PortalRenaming component. 2022-03-02 11:21:40 +03:00
6aa9a4a926 Added the WhiteLabe component to the Customization component. 2022-03-02 11:17:08 +03:00
efcfd69ef3 Web:Studio:Added setWhiteLabelSettings, restoreWhiteLabelSettings to the WhiteLabe component. Added the onSave method to the WhiteLabe component. 2022-03-02 11:16:19 +03:00
97b3b8daf7 Web:Common:Added setWhiteLabelSettings, restoreWhiteLabelSettings, setPortalRename, setMailDomainSettings, setIpRestrictions, setIpRestrictionsEnable, setMessageSettings, setCookieSettings, setLifetimeAuditSettings to SettingsSetupStore. 2022-03-02 11:13:02 +03:00
Timofey
19937f50dd Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-01 22:05:41 +08:00
9e8b80c6dd Api: added form method support 2022-03-01 14:10:41 +03:00
f3afd79a3f Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
#	packages/asc-web-common/components/AdvancedSelector/AdvancedSelector.js
#	packages/asc-web-common/components/AdvancedSelector/sub-components/Selector.js
#	packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
#	packages/asc-web-common/components/PageLayout/index.js
#	packages/asc-web-common/store/SettingsStore.js
#	packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/context-menu/styled-context-menu.js
#	packages/asc-web-components/drop-down/index.js
#	packages/asc-web-components/link-with-dropdown/index.js
#	packages/asc-web-components/row/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	packages/asc-web-components/themes/dark.js
#	products/ASC.Files/Client/public/images/files.menu.svg
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Badges.js
#	products/ASC.Files/Client/src/components/QuickButtons.js
#	products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/ModalView.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/pages/Home/index.js
#	products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
#	products/ASC.People/Client/public/images/people.menu.svg
#	products/ASC.People/Client/src/components/GroupSelector/index.js
#	products/ASC.People/Client/src/components/PeopleSelector/index.js
#	products/ASC.People/Client/src/pages/Home/Section/Body/RowView/userContent.js
#	products/ASC.People/Client/src/pages/Home/index.js
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header-nav.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/nav-item.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/profile-menu.js
#	web/ASC.Web.Client/src/components/pages/Home/index.js
2022-03-01 13:50:26 +03:00
Timofey
7bd66a04ab Web:Client:NavMenu: add special name for catalog burger for mobile view 2022-03-01 17:53:48 +08:00
Timofey
062cb1e6cd Web:Studio: disable settings icon in header 2022-03-01 01:39:24 +08:00
9aff975cd4 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-02-28 16:17:48 +03:00
322b07dd5e Web: Login: Tests: update screenshots 2022-02-28 16:16:50 +03:00
45a2868f77 Web: Login: Tests: add pause 2022-02-28 16:16:30 +03:00
9354bce5a0 Web: Login: fix panel width 2022-02-28 16:02:28 +03:00
20c0900e12 Web: Login: fix panel width 2022-02-28 15:54:22 +03:00
Dmitry Kulak
92d3a3275f Web: Studio: Homepage: Fixed greeting message styles 2022-02-25 18:57:24 +03:00
2eeed99efa Web: Client: Main: Removed --vh parameter from global styles for non IOS devices 2022-02-25 11:28:23 +03:00
d40d73a3a5 GoogleAuth: fix 94 issue 2022-02-24 17:36:44 +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
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
a797b3490e Files: async fixes 2022-02-22 12:22:15 +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
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
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
89cc5bfbec Api: added cookiesettings 2022-02-18 18:28:03 +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
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
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
7f4d29da03 Web: Editor: fixed canConvert 2022-02-15 16:57:32 +03:00
Vashchuk Nikita
b17119b711 refactoring async methods 2022-02-15 16:20:06 +03:00
af51658493 Web: Campaigns: init example 2022-02-15 13:09:44 +03:00
f26eb17fe1 Web: Common: move shell changes from hotfix/campaigns banner 2022-02-15 11:37:31 +03:00
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
f0fc434447 Web:Studio:Added PortalRenaming component. Removed the TeamTemplate component from the Customization component. 2022-02-14 16:33:27 +03:00
11ec12801a Web:Studio:Added showReminder to true on title change. 2022-02-14 13:49:48 +03:00
9cb69a930a Web:Studio:Added props hasChanged to display SaveCancelButtons. 2022-02-14 13:13:55 +03:00
11f9c2727b Web:Studio:Added translation of CustomTitlesTooltip. Added keys CustomTitlesFrom, CustomTitlesHeader, CustomTitlesSettingsTooltip, CustomTitlesSettingsTooltip, CustomTitlesText, CustomTitlesWelcome for locales ru. 2022-02-14 00:00:06 +03:00
0bd6afb49d Web:Studio:Removed the onCancelClick method in the CustomTitles component. 2022-02-13 19:48:37 +03:00
bd5a3a8a01 Web:Components:Added styles to SaveCancelButtons. 2022-02-13 19:33:20 +03:00
80bb051d2b Web:Studio:Delete flagChanges key to sessionStorage. 2022-02-13 16:29:46 +03:00
Vashchuk Nikita
631dcdc2e8 Merge branch 'develop' into feature/async
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
#	common/ASC.Data.Storage/CrossModuleTransferUtility.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/Extensions.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Data.Storage/StorageHandler.cs
#	common/services/ASC.ApiSystem/Controllers/PortalController.cs
#	products/ASC.CRM/Server/Api/VoipController.cs
#	products/ASC.CRM/Server/Core/Dao/RelationshipEventDao.cs
#	products/ASC.CRM/Server/Utils/PdfCreator.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/SearchHandler.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/MailMergeTask.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	web/ASC.Web.Core/Files/DocumentService.cs
#	web/ASC.Web.Core/Files/DocumentServiceLicense.cs
#	web/ASC.Web.Core/Helpers/ApiSystemHelper.cs
#	web/ASC.Web.Core/Recaptcha.cs
#	web/ASC.Web.Core/Utility/UrlShortener.cs
2022-02-12 00:51:48 +03:00
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
Vashchuk Nikita
7164c54b44 fix 2022-02-10 21:25:40 +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
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
b3eb58971e Web: Login: fix test 2022-02-09 15:57:19 +03:00
099387672a Web: Client: add welcome translate 2022-02-09 15:23:15 +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
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
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
Timofey
bdb587199b Web:Studio: add support dark-theme for top arrow in profile menu 2022-02-08 17:52:22 +08: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
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
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
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
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
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
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
fd5839822d Web: Client: fix recover access style 2022-02-03 16:29:41 +03:00
a477947042 Web: Login: add error/warning bar 2022-02-03 16:08:22 +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
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