Commit Graph

8605 Commits

Author SHA1 Message Date
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
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
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
0ba2e2d933 Web: Client: Tests: add test 2022-02-14 15:06:27 +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
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
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
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
6ee61695be Web: files: added start restore. 2022-02-10 13:16:46 +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
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
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
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
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
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
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
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
fbf0dcc6f5 Web: Login: fix get sso 2022-02-01 17:44:12 +03: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
fa175efb73 Web: Login: move styles 2022-02-01 13:36:08 +03:00
Timofey
cf3d4c71e3 Merge branch 'devlop' into branch feature/catalog 2022-01-31 23:52:52 +08:00
Vashchuk Nikita
2901d837a1 async methods for httpClient in ASC.Web 2022-01-31 17:35:36 +03:00
47d43fbcfb WebL Editor: Removed commented code 2022-01-31 15:16:31 +03:00
17cb4a647b analizators: bugfix 2022-01-31 14:35:59 +03:00
34ff334692 Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03:00
615252c487 Web: add sso button 2022-01-31 12:33:39 +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
1908af64f0 cache: return support kafka. refactoring 2022-01-27 15:20:51 +03: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
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
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
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
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