Artem Tarasov
|
2ef94f75da
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Editor/webpack.config.js
# yarn.lock
|
2022-07-01 23:41:10 +03:00 |
|
Artem Tarasov
|
afce89dda2
|
Web: Doceditor: refactoring, changed hierarchy, added hmr, global styles
|
2022-07-01 23:33:35 +03:00 |
|
|
|
a289f9594a
|
modified LdapNotifyHelper to BackgroundService
|
2022-07-01 14:49:59 +03:00 |
|
Vashchuk Nikita
|
5a0acc8eaa
|
Renaming folders for contexts and models
|
2022-07-01 14:23:07 +03:00 |
|
|
|
329ec57aa2
|
Merge branch 'develop' into feature/LDAP-new
|
2022-07-01 13:15:52 +03:00 |
|
|
|
6226340b3b
|
Web: Client: add locales for Help center key
|
2022-07-01 13:00:57 +03:00 |
|
|
|
942030614f
|
Fix Bug 57840: add community forum and help center buttons
|
2022-07-01 12:33:46 +03:00 |
|
|
|
ba6c4069c9
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-01 10:10:52 +03:00 |
|
|
|
224f928ee4
|
Web: Layout: Fixed page shift when focusing in a row when renaming. (iOS, Chrome)
|
2022-07-01 10:10:29 +03:00 |
|
|
|
45cd9434f4
|
fix Bug 57888
|
2022-06-30 19:41:17 +03:00 |
|
|
|
74d238bde8
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Common/Caching/KafkaCache.cs
# common/ASC.Common/Logging/Log.cs
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Backup.Core/BackupResource.Designer.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.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/ASC.Notify.Textile.csproj
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
# products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs
# products/ASC.Files/Core/Core/Compress/CompressToZip.cs
# products/ASC.Files/Core/Core/Compress/ICompress.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Resources/FilesJSResource.Designer.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/Utils/EntryManager.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
|
2022-06-30 16:13:31 +03:00 |
|
|
|
3871712357
|
Fixed Bug 57873: Scrolling of the page body is disabled.
|
2022-06-30 15:54:58 +03:00 |
|
|
|
35ab5a3531
|
fix order
|
2022-06-29 19:43:29 +03:00 |
|
|
|
605c78f5dd
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-29 17:16:18 +03:00 |
|
|
|
11e4595939
|
Fix bug: the site header shifts if you open the keyboard on an android phone
|
2022-06-29 17:16:09 +03:00 |
|
|
|
5f6851253f
|
fix bug 57725
|
2022-06-29 15:10:56 +03:00 |
|
|
|
9e05dc641a
|
notify: temp logs
|
2022-06-28 23:32:33 +03:00 |
|
|
|
4415df375f
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 19:31:38 +03:00 |
|
|
|
2512820217
|
Web: Editor: Added opportunity to work with created docEditor from window.ASC.Files.Editor.docEditor (Mobile App Back button issue)
|
2022-06-28 19:31:28 +03:00 |
|
|
|
d4a5ec5315
|
notify: logs
|
2022-06-28 16:55:35 +03:00 |
|
|
|
772b42f636
|
Merge pull request #702 from ONLYOFFICE/feature/settings-docspace-mode
feature/settings-docspace-mode
|
2022-06-28 14:51:57 +03:00 |
|
|
|
933b0696ef
|
WebApi: added docspace in settings
|
2022-06-28 14:47:28 +03:00 |
|
|
|
e17f49e344
|
Merge branch 'develop' into feature/LDAP-new
# Conflicts:
# ASC.Web.sln
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/GlobalUsings.cs
|
2022-06-28 14:30:40 +03:00 |
|
|
|
95a694ac10
|
Web: Client: fixed error two children with the same key, index.
|
2022-06-28 13:12:28 +03:00 |
|
|
|
2b48707f5c
|
sso: fix
|
2022-06-28 12:36:34 +03:00 |
|
|
|
097290e8a2
|
Fix Bug 57787 - Selected user's theme option is used for Desktop Editors
|
2022-06-27 19:22:59 +03:00 |
|
Artem Tarasov
|
e38c15af56
|
Web: Client: Layout: deleted unnecessary code
|
2022-06-27 15:05:49 +03:00 |
|
Artem Tarasov
|
be438745a9
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-27 14:57:48 +03:00 |
|
Artem Tarasov
|
bba5c2a07a
|
Web: Client: Layout: Bug 57712 - Mobile. Section title goes outside the workspace when scrolling the page
|
2022-06-27 14:57:29 +03:00 |
|
|
|
6d98440200
|
az resources
|
2022-06-27 14:00:23 +03:00 |
|
|
|
3355c3ce99
|
Fix Bug 57772: add back arrow for about page
|
2022-06-27 11:40:17 +03:00 |
|
|
|
b58422cfee
|
Merge branch 'develop' into feature/branding
|
2022-06-24 18:51:33 +03:00 |
|
mushka
|
a5650bcf48
|
removed unused SystemThemeDetector component
|
2022-06-23 17:06:06 +03:00 |
|
mushka
|
da27de2cac
|
Fixed Bug 57722 - Now app theme will change with system theme without reloading
|
2022-06-23 16:54:22 +03:00 |
|
|
|
45e791a092
|
removed unused code
|
2022-06-23 16:00:24 +03:00 |
|
|
|
96775f7a0a
|
fix for eb896018d4 2b19ec7997
|
2022-06-23 15:43:22 +03:00 |
|
mushka
|
2e187f6605
|
removed unused console.log
|
2022-06-22 14:48:24 +03:00 |
|
mushka
|
c4a0c109e6
|
Fixed Bug 57721: Web: Files: Removed burger menu button from header in OFORM Gallery
|
2022-06-22 14:45:25 +03:00 |
|
|
|
f2da6fc55c
|
Merge pull request #693 from ONLYOFFICE/feature/docspace
Feature/docspace
|
2022-06-22 11:55:36 +04:00 |
|
|
|
bbcd5b7382
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 19:45:30 +03:00 |
|
|
|
2d9bd5943d
|
fix Bug 57661
|
2022-06-21 18:13:21 +03:00 |
|
Artem Tarasov
|
93b6e3174d
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 17:45:10 +03:00 |
|
Artem Tarasov
|
96fd3734e4
|
Web: Client: Layout: Fixed Bug 57666 - Mobile. Content is not displayed in the horizontal position of the screen (ios, chrome)
|
2022-06-21 17:44:23 +03:00 |
|
|
|
01a03674ef
|
Web: Client: Wizard: fix translate ns
|
2022-06-21 17:27:22 +03:00 |
|
|
|
d4f459740f
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 16:30:15 +03:00 |
|
|
|
87839bfb7f
|
Web: Translations: Fix NotFoundKeysTest
|
2022-06-21 13:29:37 +03:00 |
|
|
|
9d82ae8719
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 13:25:08 +03:00 |
|
|
|
793f999fe9
|
Web:Studio:Added styles to Preview.
|
2022-06-21 13:23:00 +03:00 |
|
|
|
12b6aea843
|
Web:Studio:Added theme selection, Appearance page layout.
|
2022-06-21 13:21:47 +03:00 |
|
|
|
d6ad1325f6
|
Web: Client: fixed double api requests
|
2022-06-20 18:56:12 +03:00 |
|
|
|
03e756277b
|
fixed warnings
|
2022-06-20 17:01:59 +03:00 |
|
|
|
2b19ec7997
|
rebranding
|
2022-06-20 16:59:03 +03:00 |
|
|
|
975db80282
|
Web: Login: applied specific style for login checkbox
|
2022-06-20 15:39:40 +03:00 |
|
|
|
eb896018d4
|
whitelabel
|
2022-06-20 14:09:47 +03:00 |
|
|
|
e68ac70005
|
Merge branch 'develop' into feature/docspace
|
2022-06-20 12:15:08 +03:00 |
|
mushka
|
d4cfd235fc
|
merge with release
|
2022-06-20 11:25:28 +03:00 |
|
|
|
e2cee2c2fc
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.FederatedLogin/OAuth20Token.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/ASC.Resource.Manager/Program.cs
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# config/appsettings.json
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.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/ThumbnailSettings.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
# products/ASC.Files/Core/Model/SessionModel.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.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/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/ThirdPartyApp/Token.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileMarker.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/DocStore
# 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/Worker.cs
# products/ASC.People/Server/ASC.People.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
# web/ASC.Web.Core/PublicResources/Resource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
# web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-06-19 22:44:48 +03:00 |
|
|
|
8ea04bcc81
|
Merge branch 'develop' into feature/12.0
# Conflicts:
# common/ASC.MessagingSystem/Data/MessagesRepository.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
|
2022-06-17 19:19:00 +03:00 |
|
|
|
2479448c6c
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-17 16:16:04 +03:00 |
|
|
|
9bbe797bfc
|
Web:Studio:Added Appearance component to COMMON_URLS.
|
2022-06-17 16:15:24 +03:00 |
|
|
|
c4d4e73c83
|
Web:Studio:Added an Appearance component to the Common Settings Submenu.
|
2022-06-17 16:14:26 +03:00 |
|
|
|
e6c51afc30
|
Web:Studio:Added Preview component.
|
2022-06-17 16:13:11 +03:00 |
|
|
|
cf0acb2179
|
Web:Studio:Added Appearance page.
|
2022-06-17 16:12:09 +03:00 |
|
|
|
3c699266c2
|
Fixed Bug 57622 - Mobile. Hidden hotkeys for mobile devices
|
2022-06-17 11:04:05 +03:00 |
|
|
|
fc93c6336a
|
Files: added email invitation
|
2022-06-16 18:34:38 +03:00 |
|
|
|
56ece27e1b
|
moved from ddf515b8
|
2022-06-16 17:16:46 +03:00 |
|
|
|
d4da3cc82e
|
Fixed Bug 57605 - Mobile. Fixed layout height for mobile devices
|
2022-06-16 15:23:45 +03:00 |
|
|
|
c9fb0d3dac
|
moved from ddf515b8
|
2022-06-16 11:13:53 +03:00 |
|
|
|
6836f2ea64
|
Web: Client: fixed Layout height
|
2022-06-15 15:03:21 +03:00 |
|
|
|
f3f3ed96ae
|
moved from ddf515b8
|
2022-06-15 12:46:21 +03:00 |
|
Artem Tarasov
|
2eebeb3c1a
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-06-14 11:22:23 +03:00 |
|
|
|
35bebe49f9
|
moved from ddf515b8
|
2022-06-14 11:11:41 +03:00 |
|
|
|
49233efe66
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-14 10:35:42 +03:00 |
|
|
|
5d89337132
|
Web:Studio:Added branding page. Added the CompanyInfoSettings and AdditionalResources settings to the Branding page.
|
2022-06-14 10:33:50 +03:00 |
|
|
|
e9b86623d6
|
Web:Studio:Moved WhiteLabel to settingsBranding folder.
|
2022-06-14 10:31:27 +03:00 |
|
|
|
3c077c023d
|
Web:Replaced light_small_general and dark_general logotypes with doc_space for WhiteLabel.
|
2022-06-14 10:31:11 +03:00 |
|
|
|
a49814beff
|
Web:Replaced light_small_general and dark_general logotypes with doc_space for WhiteLabel.
|
2022-06-14 10:28:32 +03:00 |
|
|
|
7ddb0506c9
|
Web: Files: moved Hotkeys translation, added button to open hotkeys
|
2022-06-10 11:30:57 +03:00 |
|
|
|
1df086f408
|
Web: Client: Settings: use help link
|
2022-06-08 17:58:11 +03:00 |
|
|
|
d77b0b6b32
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/security-settings
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/passwordStrength.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/tfa.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/trustedMail.js
|
2022-06-08 17:53:49 +03:00 |
|
|
|
59eee29c61
|
Web: Client: Settings: add session lifetime loader
|
2022-06-08 17:51:26 +03:00 |
|
Artem Tarasov
|
d761598b1f
|
Web: Client: Settings: applied helpLink from settings
|
2022-06-08 17:47:24 +03:00 |
|
|
|
6ec27544aa
|
Web: Client: Settings: add admin message loader
|
2022-06-08 17:46:17 +03:00 |
|
|
|
860db2916f
|
Web: Client: Settings: add ip security loader
|
2022-06-08 17:41:38 +03:00 |
|
|
|
ff30a58480
|
Web: Client: Settings: add trusted mail loader
|
2022-06-08 17:34:59 +03:00 |
|
|
|
921d479639
|
Web: Client: Settings: add tfa loader
|
2022-06-08 17:27:23 +03:00 |
|
|
|
d5c8ab19dd
|
Web: Client: Settings: add password strength loader
|
2022-06-08 17:23:28 +03:00 |
|
|
|
b693779ea1
|
Merge branch 'develop' into feature/docspace-pin
|
2022-06-08 16:38:16 +03:00 |
|
|
|
0af103fdb6
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/security-settings
|
2022-06-08 16:14:12 +03:00 |
|
|
|
749feab8e8
|
Web: Client: Settings: add access loader
|
2022-06-08 16:14:03 +03:00 |
|
|
|
83fc657f4b
|
Web: Client: Settings: add mobile security loader
|
2022-06-08 16:13:44 +03:00 |
|
|
|
1472644f04
|
Web: Client: Settings: add loader
|
2022-06-08 15:35:22 +03:00 |
|
|
|
832a341306
|
fix Bug 57478
|
2022-06-08 13:48:28 +03:00 |
|
Vashchuk Nikita
|
8410299051
|
modified logging
|
2022-06-08 12:42:49 +03:00 |
|
|
|
cbd73be90b
|
moved from ddf515b8
|
2022-06-08 12:02:40 +03:00 |
|
|
|
c1d152becc
|
moved from ddf515b8
|
2022-06-07 21:00:08 +03:00 |
|
|
|
bef003446e
|
Merge branch 'feature/admin-messages' of github.com:ONLYOFFICE/AppServer into feature/session-lifetime
|
2022-06-07 13:40:56 +03:00 |
|
|
|
c534db530c
|
Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
|
2022-06-07 13:40:14 +03:00 |
|
|
|
ab0f85d0e3
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-06-07 13:39:44 +03:00 |
|
|
|
b9c2b046aa
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-03 16:33:17 +03:00 |
|
|
|
b0f2892664
|
edit translations
|
2022-06-03 16:32:59 +03:00 |
|
|
|
29fd1b83cf
|
Fixed Bug 53176 - Client.Files.Clouds. Error ‘You cannot update a file which is opened for editing’ at editor
|
2022-06-03 15:52:50 +03:00 |
|
|
|
2cf70f38ca
|
Web: Client: SmartBanner: show only on touch devices
|
2022-06-03 12:37:55 +03:00 |
|
|
|
ef10cbfd01
|
edit translations
|
2022-06-03 10:25:03 +03:00 |
|
|
|
848751220c
|
Files: added logos for rooms
|
2022-06-02 21:41:16 +03:00 |
|
|
|
8d3320d9d4
|
edit translations
|
2022-06-02 18:45:28 +03:00 |
|
|
|
4ed473eed8
|
edit translations
|
2022-06-02 18:42:21 +03:00 |
|
|
|
1d24adba7d
|
edit translations
|
2022-06-02 17:45:25 +03:00 |
|
|
|
e7d3b081ea
|
update translations
|
2022-06-02 17:05:59 +03:00 |
|
|
|
68aeaa83dd
|
edit translations
|
2022-06-02 13:22:24 +03:00 |
|
|
|
1aa605fb98
|
Web: Client: Settings: delete console log
|
2022-06-01 18:27:36 +03:00 |
|
|
|
8fb5f45d10
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-06-01 18:25:47 +03:00 |
|
|
|
a1b7a47e45
|
Web: Client: Settings: fix logic
|
2022-06-01 18:25:23 +03:00 |
|
|
|
a861268e4f
|
moved from ddf515b8
|
2022-06-01 17:07:08 +03:00 |
|
|
|
d0b74d4c30
|
Web: Client: Settings: fix logic
|
2022-06-01 14:58:34 +03:00 |
|
|
|
9a20c4c93e
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-01 14:44:54 +03:00 |
|
|
|
3ebd67f444
|
merge from develop
|
2022-06-01 14:44:30 +03:00 |
|
|
|
1de68d0247
|
Web: Fixed dark theme for backup module.
|
2022-06-01 14:43:43 +03:00 |
|
|
|
8c1cfd2ed8
|
Web: Client: Settings: show error
|
2022-06-01 14:43:00 +03:00 |
|
|
|
98e318ee11
|
Web: Client: Settings: fix init settings
|
2022-06-01 14:35:36 +03:00 |
|
|
|
753d0b0605
|
Merge branch 'feature/admin-messages' of github.com:ONLYOFFICE/AppServer into feature/session-lifetime
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
# web/ASC.Web.Client/public/locales/en/Settings.json
|
2022-06-01 14:26:24 +03:00 |
|
|
|
c9292331b8
|
Web: Client: add smart banner store, fix layout height
|
2022-06-01 14:11:11 +03:00 |
|
|
|
d7d21f765e
|
Web: Client: Settings: fix init settings
|
2022-06-01 13:47:42 +03:00 |
|
|
|
958e13cbb3
|
Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
|
2022-06-01 13:36:25 +03:00 |
|
|
|
349c3cae0e
|
Web: Client: Settings: add support ip range
|
2022-06-01 13:29:23 +03:00 |
|
|
|
e9b4805a00
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-06-01 12:29:47 +03:00 |
|
|
|
4c2064714d
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-31 18:38:13 +03:00 |
|
|
|
e1dbda363c
|
edit translations
|
2022-05-31 18:37:53 +03:00 |
|
|
|
aa7d285025
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-05-31 18:03:11 +03:00 |
|
|
|
f1225ed3f6
|
Web: Client: fix layout height
|
2022-05-31 14:43:43 +03:00 |
|
|
|
7c511eb4db
|
Web: Client: SmartBanner: decrease z-index
|
2022-05-31 11:33:36 +03:00 |
|
|
|
30b89d1ae0
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-30 17:18:53 +03:00 |
|
|
|
e2a705dce2
|
edit translations
|
2022-05-30 17:18:33 +03:00 |
|
|
|
52a6b27083
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-05-30 16:46:25 +03:00 |
|
|
|
5a26c4f404
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-30 15:33:17 +03:00 |
|
|
|
e4a8c11602
|
Merge branch 'develop' into feature/LDAP-new
|
2022-05-30 14:20:46 +03:00 |
|
mushka
|
5ad2231fc3
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-05-27 15:24:29 +03:00 |
|
|
|
881a70a540
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-27 14:58:43 +03:00 |
|
|
|
c092ae1d13
|
Fixed Bug 57327: Wrong size of icon on mobile shortcut
|
2022-05-27 14:58:32 +03:00 |
|
|
|
96518a2ad5
|
edit translations
|
2022-05-27 14:09:16 +03:00 |
|
|
|
cf8badeea3
|
Api: refactoring
|
2022-05-27 12:32:58 +03:00 |
|
|
|
470c983e2e
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-26 21:46:36 +03:00 |
|
|
|
325a53579a
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 19:22:45 +03:00 |
|
|
|
d35ae571e2
|
edit translations
|
2022-05-26 19:21:39 +03:00 |
|
|
|
4bb7ee25e8
|
Web: Client: wait ready translations
|
2022-05-26 18:13:20 +03:00 |
|
|
|
341749d1db
|
Web: Client: SmartBanner: fix cookies
|
2022-05-26 18:07:32 +03:00 |
|
Nikita
|
54341cb203
|
fixed input and output parameters in Api(LdapController)
|
2022-05-26 17:39:02 +03:00 |
|
|
|
f3505e2b4a
|
Web: fix smart banner meta
|
2022-05-26 17:35:59 +03:00 |
|
|
|
dc7d837e46
|
Merge branch 'release/v1.2' into feature/smart-banner
|
2022-05-26 16:57:04 +03:00 |
|
|
|
7a7b83c78e
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 18:16:23 +05:00 |
|
|
|
6b071a8634
|
Web: Campaigns: added react device detect
|
2022-05-26 18:16:09 +05:00 |
|
|
|
8cb26ba1aa
|
Web: Campaigns: added cross icon
|
2022-05-26 18:15:28 +05:00 |
|
Timofey Boyko
|
1e92d209e1
|
Web:Client:About: fix personal logo color for dark theme
|
2022-05-26 15:33:34 +03:00 |
|
|
|
07c7439687
|
edit translations
|
2022-05-26 15:00:16 +03:00 |
|
|
|
76db35e748
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-26 13:40:26 +03:00 |
|
|
|
968e4440ea
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 13:18:06 +03:00 |
|
|
|
0a84d45b58
|
edit translations
|
2022-05-26 13:17:43 +03:00 |
|
|
|
d24d60a5e6
|
Web:fixed snackbar display delay
|
2022-05-26 15:08:41 +05:00 |
|
|
|
e7886aff2c
|
Log: refactoring
|
2022-05-26 12:01:54 +03:00 |
|
|
|
8a935ec96c
|
Web: Client: use translations in SmartBanner
|
2022-05-26 11:29:13 +03:00 |
|
|
|
4bf2d3ec6f
|
Web: Client: add SmartBanner translation
|
2022-05-26 11:28:47 +03:00 |
|
|
|
84af332a63
|
Web: Client: fix
|
2022-05-25 22:37:40 +03:00 |
|
|
|
6c3450e3da
|
Web: Client: add translate for SmartBanner
|
2022-05-25 22:36:07 +03:00 |
|
|
|
c7003c7984
|
Web: Client: move SmartBanner into folder
|
2022-05-25 22:25:19 +03:00 |
|
|
|
0296c1f22c
|
Web: Client: delete console log
|
2022-05-25 22:15:43 +03:00 |
|
|
|
219cd835d3
|
Web: Client: show smart banner only in Documents
|
2022-05-25 22:14:44 +03:00 |
|
|
|
59f1307223
|
Web: Client: SmartBanner: fix show logic
|
2022-05-25 22:07:50 +03:00 |
|
|
|
7d42847f60
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-25 20:05:01 +03:00 |
|
|
|
d8c870c599
|
edit translations
|
2022-05-25 18:47:28 +03:00 |
|
|
|
1850b9bc1b
|
update translations
|
2022-05-25 18:42:21 +03:00 |
|
|
|
b13fd240ad
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-25 18:11:50 +03:00 |
|
|
|
903767b3e8
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
# web/ASC.Web.Client/public/locales/ro/Error403.json
# web/ASC.Web.Client/public/locales/ro/ErrorInvalid.json
# web/ASC.Web.Client/public/locales/ro/Offline.json
|
2022-05-25 18:07:28 +03:00 |
|
|
|
8612f14060
|
Web: Client: Fixed displaying page icon for creating page shortcut, fixed page display mode at manifest
|
2022-05-25 18:01:38 +03:00 |
|
|
|
3276561123
|
edit translations
|
2022-05-25 17:52:59 +03:00 |
|
|
|
e01858d2e8
|
merge from develop
|
2022-05-25 16:58:31 +03:00 |
|
|
|
e6d7979e92
|
dbcontext: EnableRetryOnFailure for MySQL provider
|
2022-05-25 16:55:38 +03:00 |
|
|
|
9a067e524a
|
Merge pull request #678 from ONLYOFFICE/feature/layout-for-banner
Feature/layout for banner
|
2022-05-25 16:19:14 +03:00 |
|
|
|
5674836f6f
|
Web: Client: SmartBanner: fix force
|
2022-05-25 16:03:28 +03:00 |
|
|
|
21ceecee4a
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-25 15:54:37 +03:00 |
|
|
|
ceb2e395fe
|
Web: Client: add smart banner
|
2022-05-25 15:53:26 +03:00 |
|
|
|
17caec2581
|
Web: Translations: Fix some SingleKeyFilesTest issues
|
2022-05-25 14:53:28 +03:00 |
|
|
|
4789e5e5ce
|
Web: Campaigns: added Docs_7_1 stories
|
2022-05-25 14:56:11 +05:00 |
|
|
|
9485c2e59e
|
Web: Campaigns: fixed origin for NewYear stories
|
2022-05-25 14:55:39 +05:00 |
|
|
|
7055ff083f
|
Web: Campaigns: updated yarn lock
|
2022-05-25 14:54:56 +05:00 |
|
|
|
439d7d8d73
|
Merge branch 'release/v1.2' into feature/layout-for-banner
|
2022-05-25 14:43:51 +05:00 |
|
|
|
1f18ae7194
|
Web: Campaigns: added NewYear stories
|
2022-05-25 14:41:24 +05:00 |
|
|
|
3a74878277
|
Web: Campaigns: created Section
|
2022-05-25 14:40:54 +05:00 |
|
|
|
66a7f48cea
|
Web: Campaigns: created Header
|
2022-05-25 14:40:23 +05:00 |
|
|
|
189687a537
|
Web: Campaigns: added theme
|
2022-05-25 14:39:43 +05:00 |
|
|
|
532b4dd36a
|
Web: Campaigns: created Article
|
2022-05-25 14:39:14 +05:00 |
|
|
|
27c4d9e662
|
Web: Campaigns: created Layout
|
2022-05-25 14:38:49 +05:00 |
|
|
|
b0bd02044c
|
Web: Campaigns: added storybook
|
2022-05-25 14:26:08 +05:00 |
|
|
|
11ad1819f2
|
Web: Campaigns: added storybook and styled components
|
2022-05-25 14:25:11 +05:00 |
|
|
|
1c1aa2b9b6
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-25 10:53:54 +03:00 |
|
|
|
70a6a44196
|
Web: Client: Disable PWA feature for mobile devices
|
2022-05-25 10:53:39 +03:00 |
|
|
|
6491009d9e
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-25 10:43:27 +03:00 |
|
|
|
2b86d19122
|
Web: Client: Added <AppLoader />
|
2022-05-25 10:43:19 +03:00 |
|
|
|
a66c03aa86
|
Merge branch 'develop' into feature/logger-refactoring
# Conflicts:
# common/ASC.Common/Caching/AscCache.cs
# common/ASC.Common/GlobalUsings.cs
# common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
# common/ASC.Data.Storage/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs
# common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs
# common/services/ASC.Notify/GlobalUsings.cs
# common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs
# common/services/ASC.Notify/Services/NotifySenderService.cs
# common/services/ASC.TelegramService/GlobalUsings.cs
# common/services/ASC.TelegramService/TelegramHandler.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/Settings/StorageController.cs
|
2022-05-24 23:13:57 +03:00 |
|
|
|
7aba8f85ca
|
Web: Client: increase progress indicator z-index
|
2022-05-24 19:52:20 +03:00 |
|
|
|
b411f61ee5
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-24 18:31:49 +03:00 |
|
|
|
786ff38a98
|
update editor
|
2022-05-24 18:31:24 +03:00 |
|
|
|
4b6aa555ec
|
Web: Client: Added check of ready prop (Fix translation loading issue)
|
2022-05-24 17:43:25 +03:00 |
|
|
|
02570e12cf
|
Merge branch 'develop' into feature/cluster-services
|
2022-05-24 17:24:25 +03:00 |
|
|
|
907d92fcb6
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-24 15:00:26 +03:00 |
|
|
|
95f356adbd
|
edit translations
|
2022-05-24 14:55:28 +03:00 |
|
Nikita
|
1d2521c399
|
fix
|
2022-05-24 12:59:04 +03:00 |
|
|
|
ea4b14ac47
|
Merge branch 'release/v1.2' into feature/multiply-thumb
|
2022-05-24 12:29:49 +03:00 |
|
|
|
6168410931
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-24 10:44:15 +03:00 |
|
|
|
587ee6240b
|
Fix Bug 57304 - Client. Errors in the console when clicking on the information banner
|
2022-05-24 10:44:09 +03:00 |
|
|
|
67a235da5c
|
edit ro-variable
|
2022-05-24 10:32:38 +03:00 |
|
|
|
2a673036ff
|
encryption service: migrate from ICacheNotify to RabbitMQ
|
2022-05-23 22:06:22 +03:00 |
|
|
|
13ad4381f7
|
Api: removed CustomHttpMethodAttribute
added AllowNotPaymentAttribute
|
2022-05-23 18:48:23 +03:00 |
|
|
|
d1494ca672
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-23 18:10:09 +03:00 |
|
|
|
5dd80c1e6a
|
edit translations (SpellCheck)
|
2022-05-23 18:05:51 +03:00 |
|
|
|
c659e03042
|
update uk
|
2022-05-23 18:04:34 +03:00 |
|
Nikita
|
a7b9b77613
|
fix
|
2022-05-23 16:38:05 +03:00 |
|
|
|
2b9131330c
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-23 15:19:07 +03:00 |
|
|
|
de0e722776
|
Fixed Bug 55045: Added scroll to current folder where file located in select folder dialog.
|
2022-05-23 15:15:39 +03:00 |
|
|
|
f791f1206d
|
Merge pull request #674 from ONLYOFFICE/feature/banner-docs_7_1
Feature/banner docs 7 1
|
2022-05-23 14:38:40 +03:00 |
|
|
|
1b9a0b3c30
|
Web: Client: IOS: fixed logo styles
|
2022-05-23 13:11:25 +03:00 |
|
|
|
9903f4c439
|
update cs, edit translations (spellCheck)
|
2022-05-23 10:55:02 +03:00 |
|
|
|
2eaa6bb599
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
|
2022-05-22 21:22:59 +03:00 |
|
|
|
cd802863f6
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
|
2022-05-22 21:21:28 +03:00 |
|
|
|
8c68b9fb40
|
edit translations (SpellCheck)
|
2022-05-22 13:36:45 +03:00 |
|
|
|
cefc26b742
|
edit variables
|
2022-05-22 12:29:58 +03:00 |
|
|
|
e3a834649e
|
update translations (web)
|
2022-05-22 12:23:36 +03:00 |
|
|
|
357d1f227a
|
update translations (web)
|
2022-05-22 12:15:53 +03:00 |
|
|
|
5511c14415
|
update translations (web)
|
2022-05-22 11:43:16 +03:00 |
|
|
|
45f9bc472a
|
edit variables
|
2022-05-22 00:46:59 +03:00 |
|
|
|
9d1af6d3da
|
update translations
|
2022-05-22 00:38:14 +03:00 |
|
|
|
dbecb2c72f
|
edit variables
|
2022-05-21 23:38:40 +03:00 |
|
|
|
6bc4035313
|
update translations
|
2022-05-21 15:25:14 +03:00 |
|
|
|
3470e70c5e
|
Web.Campaigns: Fix translation for 0d1a0785d5.
|
2022-05-20 21:00:03 +03:00 |
|
|
|
732afbd67e
|
Merge branch 'release/v1.2' into feature/banner-docs_7_1
|
2022-05-20 19:53:04 +03:00 |
|
|
|
7493fe68e6
|
Merge branch 'release/v1.2' into bugfix/ReleaseBugfixes
|
2022-05-20 19:17:43 +03:00 |
|
|
|
4935dbc8cd
|
Merge branch 'release/v1.2' into feature/update-translation-tests
|
2022-05-20 18:37:42 +03:00 |
|
|
|
91c4e454c5
|
add loggers
|
2022-05-20 18:24:41 +03:00 |
|
|
|
49d416bf07
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-20 17:07:13 +03:00 |
|
|
|
dfe412d876
|
update translations (web)
|
2022-05-20 17:03:27 +03:00 |
|
|
|
a585a425bc
|
fix
|
2022-05-20 17:02:09 +03:00 |
|
|
|
75da995099
|
Merge branch 'develop' into feature/logger-refactoring
|
2022-05-20 17:01:51 +03:00 |
|
|
|
6295c0779d
|
Merge pull request #659 from ONLYOFFICE/feature/logger-Web.Core
Feature/logger web.core
|
2022-05-20 16:18:02 +03:00 |
|
|
|
682d55e630
|
Fix Bug 57263: use translations
|
2022-05-20 15:54:58 +03:00 |
|
|
|
cb0879da10
|
update, edit translations
|
2022-05-20 13:48:47 +03:00 |
|
|
|
baf219f0f5
|
Merge branch 'release/v1.2' into feature/multiply-thumb
|
2022-05-20 10:32:45 +03:00 |
|
Timofey Boyko
|
7cb2d922f2
|
Web:Studio: delete console log
|
2022-05-20 10:01:45 +03:00 |
|
|
|
4541fa82d1
|
update translations (web, people)
|
2022-05-19 23:35:37 +03:00 |
|
|
|
b9e98fc3ad
|
update translations (web)
|
2022-05-19 23:07:57 +03:00 |
|
|
|
9c6d1ae5df
|
update translations (Login, ConvertPasswordDialog)
|
2022-05-19 20:56:48 +03:00 |
|
Timofey Boyko
|
494e8cfd10
|
Web:Studio:Tests: hide text when build project for translation tests
|
2022-05-19 18:47:51 +03:00 |
|
|
|
770da06191
|
update pl, el
|
2022-05-19 18:21:23 +03:00 |
|
|
|
9178ec75aa
|
update el, bg, pl
|
2022-05-19 18:06:54 +03:00 |
|
mushka
|
0c69bfdabf
|
Merge branch 'release/v1.2' into bugfix/ReleaseBugfixes
|
2022-05-19 17:56:19 +03:00 |
|
Timofey Boyko
|
15cd2872a6
|
Web:Editor: add build:test.translation:personal script
|
2022-05-19 17:30:41 +03:00 |
|
|
|
b088a42158
|
Web: Editor: delete console log
|
2022-05-19 15:51:27 +03:00 |
|
|
|
60a199d54e
|
Fix Bug 57217: editor favicon
|
2022-05-19 15:44:39 +03:00 |
|
Timofey Boyko
|
6c73ad9bbe
|
Web: add scripts for build and start translation tests on personal
|
2022-05-19 15:26:09 +03:00 |
|
|
|
013532bbb7
|
Fixed Bug 57232 - Client.Files.Share.Editor. Fixed access rights in editor
|
2022-05-19 15:22:52 +03:00 |
|
|
|
dd490105e5
|
edit it (Login)
|
2022-05-19 14:46:55 +03:00 |
|
|
|
15f4fb324e
|
update it, edit fr
|
2022-05-19 14:34:56 +03:00 |
|
|
|
f8a4a7cf7c
|
Merge branch 'release/v1.2' into feature/multiply-thumb
|
2022-05-19 12:27:18 +03:00 |
|
|
|
41ab332458
|
update translations
|
2022-05-18 19:11:50 +03:00 |
|
|
|
018e1504b7
|
Merge branch 'release/v1.2' into feature/multiply-thumb
|
2022-05-18 18:38:18 +03:00 |
|
|
|
9fb495817d
|
update translations
|
2022-05-18 18:25:31 +03:00 |
|
|
|
a809c083a3
|
update translations (Client)
|
2022-05-18 17:26:33 +03:00 |
|
|
|
9886081a2e
|
Thumbnailы: added sizes config
|
2022-05-18 17:23:17 +03:00 |
|
|
|
b37c345985
|
update translations (login)
|
2022-05-18 15:59:18 +03:00 |
|
Nikita
|
b76b97af89
|
Merge branch 'develop' into feature/LDAP-new
|
2022-05-18 13:38:00 +03:00 |
|
Nikita
|
6451ac6329
|
fix
|
2022-05-18 13:36:35 +03:00 |
|
|
|
0fb61a7889
|
Edit translations - fi, sl
|
2022-05-18 13:18:19 +03:00 |
|
|
|
5f4d8b3b4c
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-18 12:58:24 +03:00 |
|
|
|
9180fbe42e
|
update ko
|
2022-05-18 12:58:02 +03:00 |
|
|
|
90d4a68946
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
# web/ASC.Web.Client/public/locales/sl/Settings.json
|
2022-05-18 10:09:44 +03:00 |
|
|
|
9c824a0bfa
|
Update translation - sl
|
2022-05-18 09:59:02 +03:00 |
|
|
|
89b607240e
|
edit ro (Confirm)
|
2022-05-17 20:15:19 +03:00 |
|
|
|
b3e14265e3
|
edit ro (Settings)
|
2022-05-17 20:04:11 +03:00 |
|
|
|
f6098aea20
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
# web/ASC.Web.Client/public/locales/ro/Settings.json
|
2022-05-17 19:57:22 +03:00 |
|
|
|
f1130c51d9
|
update ro
|
2022-05-17 19:54:47 +03:00 |
|
|
|
f466fd2fe4
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-17 18:17:17 +03:00 |
|
|
|
dad9016695
|
Web: Translations: Moved "NotFoundTitle" key from "studio" to "Common": (EnDublicatesByContentTest33ms issue fix)
|
2022-05-17 18:17:11 +03:00 |
|
|
|
2b804d5ef8
|
edit es, fr, zh-CN, ja, de, ru
|
2022-05-17 17:20:59 +03:00 |
|
|
|
2ed7b96dd9
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-17 16:43:15 +03:00 |
|
|
|
cc9d934b13
|
update de, edit en (Confirm)
|
2022-05-17 16:42:54 +03:00 |
|
|
|
43da9f3949
|
Update translation - fi
|
2022-05-17 15:35:03 +03:00 |
|
|
|
be3362dbc3
|
update ja, edit fr, es, zh-CN (Settings)
|
2022-05-17 12:56:56 +03:00 |
|
|
|
36855d656f
|
remove application/x-www-form-urlencoded
|
2022-05-17 12:29:24 +03:00 |
|
|
|
2e33540486
|
Merge branch 'feature/docspace' into feature/docspace-links
|
2022-05-17 11:53:37 +03:00 |
|
|
|
606f0bca2a
|
update es (Home), add zh
|
2022-05-16 21:05:58 +03:00 |
|
|
|
6bfcf86461
|
update es
|
2022-05-16 18:48:11 +03:00 |
|
|
|
0d1a0785d5
|
Web.Campaigns: Add ONLYOFFICE Docs v7.1 banner.
|
2022-05-16 18:43:26 +03:00 |
|
|
|
07cf71b1b7
|
Web.Campaigns: Include gatsby-plugin-google-fonts.
|
2022-05-16 18:42:14 +03:00 |
|
|
|
3818790d1c
|
update ru, fr
|
2022-05-16 18:01:38 +03:00 |
|
|
|
778f26c1fc
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-16 17:04:28 +03:00 |
|
|
|
4264a0da16
|
update fr
|
2022-05-16 17:04:04 +03:00 |
|
|
|
16019a283f
|
Web: Client: Settings: Fixed base header menu component on admin`s settings page
|
2022-05-16 15:41:02 +03:00 |
|
|
|
fc74762e0a
|
Web: Client: SelectionStore: Hide header menu if selection empty
|
2022-05-16 15:38:37 +03:00 |
|
|
|
4ad45de4b6
|
Web: Client: NavMenu: fix memory leak
|
2022-05-16 14:37:08 +03:00 |
|
|
|
5915c6e23e
|
update es
|
2022-05-16 12:51:04 +03:00 |
|
|
|
d0525e298c
|
thumbnails, notify, telegram: migrate from ICacheNotify to EventBus
|
2022-05-13 22:14:00 +03:00 |
|
|
|
a962d58b31
|
Web: Translation: Fix WrongTranslationVariablesTest issues
|
2022-05-13 19:44:05 +03:00 |
|
|
|
d12c6f89e4
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-13 19:33:23 +03:00 |
|
|
|
93a53092d6
|
Web: Translations: Fix UselessTranslationKeysTest issues
|
2022-05-13 19:33:16 +03:00 |
|
|
|
025d13557d
|
added a secure link to invite to the portal
|
2022-05-13 19:25:28 +03:00 |
|
|
|
3bf09b4353
|
add new es-files
|
2022-05-13 18:22:32 +03:00 |
|
|
|
5131e6df09
|
add loggers
|
2022-05-13 17:48:49 +03:00 |
|
|
|
294a449d78
|
add new ru-keys, edit en
|
2022-05-13 17:30:51 +03:00 |
|
|
|
941be273c6
|
add logger
|
2022-05-13 16:09:13 +03:00 |
|
|
|
b3e1014a71
|
Web: Translations: Fix ParseJsonTest issues
|
2022-05-13 14:29:56 +03:00 |
|
|
|
ed270d5702
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-13 14:22:19 +03:00 |
|
|
|
6569c18ec4
|
Web: Settings: Fix translation of Common Settings Header
|
2022-05-13 14:22:13 +03:00 |
|
|
|
411e3b7f58
|
Sso: fix
|
2022-05-13 11:52:49 +03:00 |
|
|
|
f76d024042
|
Web: Settings: Added placeholder
|
2022-05-13 11:51:56 +03:00 |
|
|
|
a956c25d16
|
Merge pull request #639 from ONLYOFFICE/feature/resx-add
Feature/resx add
|
2022-05-13 11:50:54 +03:00 |
|
|
|
298587ca46
|
Web: Settings: Added 'AutoSavePeriodHelp' key en translation (NotFoundKeysTest issue fix)
|
2022-05-13 11:41:10 +03:00 |
|
|
|
ea6bb25957
|
Web: Settings: Removed useless placeholder without translation (NotFoundKeysTest issue fix)
|
2022-05-13 11:32:44 +03:00 |
|
|
|
7fd2245587
|
Web: Translation: Fix NotFoundKeysTest issue -> "White label"
|
2022-05-13 10:51:16 +03:00 |
|
|
|
7262c4cbb8
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-12 19:00:51 +03:00 |
|
|
|
e9be6684ae
|
Resources: fixed projects
|
2022-05-12 18:32:39 +03:00 |
|
mushka
|
d2cfff7729
|
finished with ProfileMenu fix
|
2022-05-12 17:48:07 +03:00 |
|
mushka
|
cc41fc36e2
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into bugfix/ReleaseBugfixes
|
2022-05-12 17:22:39 +03:00 |
|
|
|
300bcf2247
|
Core: Notify. Resource.
|
2022-05-12 15:52:37 +03:00 |
|
|
|
01783b3598
|
Core: Resources.
|
2022-05-12 15:44:31 +03:00 |
|
|
|
d7b53943c7
|
Core: resources.
|
2022-05-12 15:41:20 +03:00 |
|
|
|
0b5d7c9320
|
Core: Resources
|
2022-05-12 15:36:04 +03:00 |
|
|
|
c1aa4c9541
|
Web: resources
|
2022-05-12 15:33:41 +03:00 |
|
|
|
3b7309eb6b
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-12 15:12:16 +03:00 |
|
|
|
d75b1344a4
|
Web:Studio:Added loader for ArticleHeaderContent.
|
2022-05-12 15:04:01 +03:00 |
|
|
|
be926bd7a2
|
Api: Resources.
|
2022-05-12 14:25:01 +03:00 |
|
Timofey Boyko
|
f994bf3f27
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-12 11:46:42 +03:00 |
|
Timofey Boyko
|
a8ba24fa0a
|
Web:Client:NavMenu: increase z-index for nav menu when profile actions in opening
|
2022-05-12 11:39:28 +03:00 |
|
Timofey Boyko
|
18f47d0d0e
|
Web:Client:NavMenu: reduce z-index for nav element
|
2022-05-12 11:38:48 +03:00 |
|
Timofey Boyko
|
1e8af919ab
|
Web:Client:NavMenu: add blur for profile menu on mobile devices
|
2022-05-12 10:57:11 +03:00 |
|
|
|
b2474c409d
|
Web: Translations: Moved "Common" key from "Studio" to "Common" and removed useless "Documents" key (test issue fix)
|
2022-05-11 19:03:33 +03:00 |
|
|
|
781b0eb3e4
|
Web: Translations: Moved "Info" key from "studio" to "Common": (test issue fix)
|
2022-05-11 17:11:52 +03:00 |
|
|
|
4ae8a10f7f
|
Web: Translations: Moved "AccessRights" key from "studio" to "Common": (test issue fix)
|
2022-05-11 16:51:37 +03:00 |
|
mushka
|
b23730ead8
|
fixed ProfileMenu and MainButton interaction
|
2022-05-11 12:26:20 +03:00 |
|
|
|
1d65ca7645
|
Files: thumbnails extension changed to jpg
|
2022-05-09 21:15:27 +03:00 |
|
|
|
e91bce51da
|
Files: thumbnails. BitDepth changed to Bit8
|
2022-05-09 18:57:07 +03:00 |
|
|
|
5454eedc78
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-05 19:00:08 +03:00 |
|
|
|
45c58a029e
|
Files: ThumbnailExtension set to jpg. SixLabors up to 1.0.0-beta0008
|
2022-05-05 18:43:40 +03:00 |
|
|
|
6d92b5d829
|
fixed Resource
|
2022-05-05 17:34:58 +03:00 |
|
|
|
e9ee6f1aad
|
Web: Campaigns: Added "firebase:logout" command
|
2022-05-05 17:10:05 +03:00 |
|
Vashchuk Nikita
|
11ac66a1e0
|
refactoring
|
2022-05-05 16:23:05 +03:00 |
|
Timofey Boyko
|
d0b8af9d6c
|
Web:Client:DebugInfo: fix padding-right for aside view
|
2022-05-05 15:49:48 +03:00 |
|
Timofey Boyko
|
dd85148fd4
|
Web:Client:AboutDialog: fix padding-right for aside view
|
2022-05-05 15:47:04 +03:00 |
|
|
|
bdc5aefe34
|
Web: Client: Layout: fixed layout scroll, fixed IOS height
|
2022-05-05 14:06:22 +03:00 |
|
Timofey Boyko
|
39e859e5f5
|
Resolve conflicts after merge
|
2022-05-05 12:16:56 +03:00 |
|
Timofey Boyko
|
9a3918439f
|
Web:Client: fix display debug info dialog
|
2022-05-05 12:12:57 +03:00 |
|
Timofey Boyko
|
e3a0556d9f
|
Web:Client: fix display about dialog
|
2022-05-05 12:12:43 +03:00 |
|
|
|
d909dd5f5f
|
Web: Client: Ipad: fixed container height after orientation change
|
2022-05-04 16:24:42 +03:00 |
|
Artem Tarasov
|
afcda9b556
|
Web: Doceditor: fix after merge, added bootstarp client
|
2022-05-03 23:26:05 +03:00 |
|
|
|
fe4b4d3c2d
|
Merge branch 'feature/admin-messages' of github.com:ONLYOFFICE/AppServer into feature/session-lifetime
|
2022-05-03 21:22:47 +03:00 |
|
|
|
01eff8cfa3
|
Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
|
2022-05-03 21:22:17 +03:00 |
|
|
|
860c53378b
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-05-03 21:18:54 +03:00 |
|
|
|
3da11e96e1
|
Web:Studio:Added isTablet for styles HeaderContainer.
|
2022-04-29 19:23:22 +03:00 |
|
Vashchuk Nikita
|
44cf5d7f80
|
fix
|
2022-04-29 18:25:49 +03:00 |
|
|
|
17282d4915
|
Web:Studio:Changed line-height for HeaderContainer for studio settings.
|
2022-04-29 17:44:55 +03:00 |
|
|
|
a27933b669
|
Web:Studio:Added props settingsStudio.
|
2022-04-29 17:43:12 +03:00 |
|
Vashchuk Nikita
|
fd472da6bc
|
added JsonPropertyName
|
2022-04-29 14:56:40 +03:00 |
|
|
|
3f4a828771
|
Web:Studio:Added placeholder "EnterName".
|
2022-04-29 12:52:06 +03:00 |
|
|
|
26b84622cf
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-29 12:34:37 +03:00 |
|
|
|
7cadbeb99e
|
Web:Studio:Rewrote whiteLabel to a functional component.
|
2022-04-29 12:33:52 +03:00 |
|
|
|
5b2f1e2636
|
Web:Studio:Added whiteLabel, setLogoText, setLogoSizes, setLogoUrls, getWhiteLabelLogoText, getWhiteLabelLogoSizes, getWhiteLabelLogoUrls to CommonStore.
|
2022-04-29 12:28:39 +03:00 |
|
|
|
5ad9e2c23b
|
Web:Studio:Removed from SettingsSetupStore common, setLogoText, setLogoSizes, setLogoUrls, getWhiteLabelLogoText, getWhiteLabelLogoSizes, getWhiteLabelLogoUrls.
|
2022-04-29 12:26:11 +03:00 |
|
Vashchuk Nikita
|
b8ed834eba
|
fix
|
2022-04-29 10:49:56 +03:00 |
|
Vashchuk Nikita
|
f39a476d06
|
added SsoController, fix
|
2022-04-28 16:56:12 +03:00 |
|
|
|
d554f0480f
|
Web: Increased stype for Scrollbar (default is mediumBlack)
|
2022-04-28 16:01:28 +03:00 |
|
Vashchuk Nikita
|
442a6bb30a
|
Merge branch 'develop' into feature/SSO-new
# Conflicts:
# config/nginx/onlyoffice.conf
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Studio/Startup.cs
|
2022-04-28 15:45:11 +03:00 |
|
Artem Tarasov
|
38e06018e5
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# packages/asc-web-common/api/client.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Editor/src/StyledEditor.js
# yarn.lock
|
2022-04-28 14:12:06 +03:00 |
|
mushka
|
53a53da543
|
finished tests on login, in progress on people and files
|
2022-04-28 13:38:16 +03:00 |
|
|
|
89059cf32e
|
Structured Logging
|
2022-04-28 12:15:33 +03:00 |
|
|
|
282ebd69a8
|
Web: Fix build without --env personal
|
2022-04-28 10:41:27 +03:00 |
|
Vashchuk Nikita
|
4cab782bc8
|
Merge branch 'develop' into feature/LDAP-new
# Conflicts:
# ASC.Web.sln
# common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/Controllers/AuthenticationController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Program.cs
# web/ASC.Web.Api/Startup.cs
|
2022-04-28 09:41:09 +03:00 |
|
|
|
d2733a2608
|
Web: Added IS_PERSONAL build parameter (yarn start:personal and yarn build:personal) for hiding useless login and confirm functional
+ removed module federated Login from personal
+ fix potential /login redirect from Editor.jsx
|
2022-04-27 19:53:25 +03:00 |
|
|
|
19cf415898
|
backend: updated packages version
|
2022-04-27 13:02:17 +03:00 |
|
|
|
74e8a1fcfd
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-26 21:13:58 +03:00 |
|
|
|
bb7201ef74
|
Web:Studio:WhiteLabel refactoring.
|
2022-04-26 21:13:41 +03:00 |
|
|
|
13bbce8ea4
|
Custom logger replaced with Microsoft.Extensions.Logging
|
2022-04-26 20:53:48 +03:00 |
|
Vashchuk Nikita
|
a4e9cae742
|
changed work with disturbedTask
|
2022-04-26 17:03:41 +03:00 |
|
Vashchuk Nikita
|
258cf02d27
|
fix ssoHandler
|
2022-04-26 14:10:12 +03:00 |
|
Timofey Boyko
|
784ec51c7a
|
Web:Client:Main: add event listener for resize page when orientation changed
|
2022-04-26 14:05:26 +03:00 |
|
Vashchuk Nikita
|
1431c5ec80
|
fix
|
2022-04-26 12:27:12 +03:00 |
|
Vashchuk Nikita
|
e812d3ec53
|
fix
|
2022-04-26 11:49:55 +03:00 |
|
Vashchuk Nikita
|
62c66e6e1f
|
Merge branch 'feature/SSO-new' of github.com:ONLYOFFICE/AppServer into feature/SSO-new
|
2022-04-25 21:42:36 +03:00 |
|
Vashchuk Nikita
|
422e87af13
|
added ssoHandler
|
2022-04-25 21:41:26 +03:00 |
|
|
|
97b45d3bd5
|
ILog: refactoring
|
2022-04-25 21:02:18 +03:00 |
|
mushka
|
cbd91d1500
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-04-25 16:40:40 +03:00 |
|
Timofey Boyko
|
edbfd1e237
|
Web:Client:NavMenu: decrease z-index for header nav menu
|
2022-04-25 12:27:00 +03:00 |
|
Timofey Boyko
|
258f994a13
|
Web:Client:Components: delete useless code
|
2022-04-25 11:43:21 +03:00 |
|
|
|
c34dac5e60
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-22 21:21:07 +03:00 |
|
|
|
5cf373a7cf
|
Web:Studio:Fix Welcome Page Settings, Portal Renaming.
|
2022-04-22 21:19:45 +03:00 |
|
|
|
379b8c0194
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-22 17:52:21 +03:00 |
|
|
|
753f1fe579
|
Web: Client: NavMenu: hide useless burger
|
2022-04-22 17:52:12 +03:00 |
|
|
|
9fcd01fc19
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-22 17:39:58 +03:00 |
|
|
|
db76c19478
|
Web:Studio:Added "Portal Renaming cancel button test", "Portal Renaming save button test", "Portal Renaming error PortalNameLength test", "Portal Renaming error PortalNameIncorrect test", "Portal Renaming mobile render test".
|
2022-04-22 17:38:47 +03:00 |
|
Artem Tarasov
|
c5d5d27f01
|
Web: Doceditor: applied changes
|
2022-04-22 17:13:56 +03:00 |
|
Artem Tarasov
|
8f37839711
|
Web: Doceditor: added packages and modified run scripts'
|
2022-04-22 17:13:38 +03:00 |
|
Artem Tarasov
|
5e7b6a5076
|
Web: Doceditor: webpack config split into separate files
|
2022-04-22 17:12:46 +03:00 |
|
|
|
ba96f1fb16
|
Web: Client: NavMenu: fix menu display position
|
2022-04-22 17:10:53 +03:00 |
|
mushka
|
dc764bb120
|
fix loaders
|
2022-04-22 16:46:22 +03:00 |
|
mushka
|
6d7d0425b5
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-04-22 16:37:23 +03:00 |
|
Timofey Boyko
|
0cc9a30483
|
Web:Common:Article: change height for IOS devices and add padding-bottom
|
2022-04-22 13:45:20 +03:00 |
|
|
|
9eba173a44
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Model/CreateFileModel.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/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2022-04-21 22:36:29 +03:00 |
|
|
|
175b934fc8
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/ip-security
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
|
2022-04-21 20:28:36 +03:00 |
|
|
|
f9fb0777d1
|
Bump version to v1.2.0
|
2022-04-21 19:15:08 +03:00 |
|
|
|
78944a490e
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-21 18:55:41 +03:00 |
|
|
|
fd9dc93fe6
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# config/kafka.json
|
2022-04-21 18:54:28 +03:00 |
|
|
|
0c141bba1a
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 18:08:42 +03:00 |
|
|
|
1f9fa82051
|
Web:Studio:Added validation for setting Portal Renaming. Added locales en "PortalNameEmpty", "PortalNameIncorrect", "PortalNameLength".
|
2022-04-21 18:07:26 +03:00 |
|
|
|
1dff9e18c4
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/ASC.Api.Core.csproj
# common/ASC.Api.Core/Core/CustomHealthCheck.cs
# common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.IPSecurity/IPRestrictionsRepository.cs
# common/ASC.IPSecurity/IPRestrictionsService.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
|
2022-04-21 17:51:31 +03:00 |
|
|
|
d6feda992b
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 17:33:16 +03:00 |
|
Timofey Boyko
|
8c12ec36d5
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 16:51:59 +03:00 |
|
Timofey Boyko
|
0428c3d6af
|
Web:Client:Components: set correct height for main and article containers for IOS devices
|
2022-04-21 16:51:51 +03:00 |
|
|
|
3373a01d9e
|
Web: Client: NavMenu: fix logo pos
|
2022-04-21 16:25:42 +03:00 |
|
|
|
41c505da8f
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 14:48:35 +03:00 |
|
|
|
596153ac21
|
Web:Studio:Fix reminderTest.
|
2022-04-21 14:47:18 +03:00 |
|
|
|
92227c45c8
|
refactoring
|
2022-04-21 13:48:22 +03:00 |
|
|
|
9cd1cdc11b
|
refactoring
|
2022-04-21 13:35:49 +03:00 |
|
Timofey Boyko
|
e33ff6a576
|
Web:Client:Components: return --vh for ios devices
|
2022-04-21 13:06:47 +03:00 |
|
|
|
301e70e605
|
Api: added continue, suspend, delete portal methods
|
2022-04-21 12:35:51 +03:00 |
|
Timofey Boyko
|
414976c49f
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-21 10:41:06 +03:00 |
|
Timofey Boyko
|
e5ce29f635
|
Web:Studio:Shell: update theme when current user theme changed
|
2022-04-21 10:36:22 +03:00 |
|
|
|
b4c6e550dc
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 18:31:08 +03:00 |
|
|
|
03f24dacac
|
Web:Studio:Fix location.pathname.
|
2022-04-20 18:29:13 +03:00 |
|
|
|
49e50093bc
|
Web:Studio:Delete console.log.
|
2022-04-20 18:28:34 +03:00 |
|
|
|
d703edba81
|
Web:Studio:Added tenantAlias, checkChanges function to PortalRenaming.
|
2022-04-20 18:26:23 +03:00 |
|
Timofey Boyko
|
216ae27b25
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-20 18:04:57 +03:00 |
|
|
|
8ca6d0d0d5
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 17:27:53 +03:00 |
|
Timofey Boyko
|
2c9a22e1d4
|
Web:Studio:NavMenu: increase z-index for header-nav component
|
2022-04-20 16:27:55 +03:00 |
|
|
|
a4dcddc78d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 14:33:39 +03:00 |
|
Vashchuk Nikita
|
bb8d0d7566
|
fix
|
2022-04-20 14:29:39 +03:00 |
|
|
|
aa16542fb4
|
Web: Login: fix style
|
2022-04-20 12:58:20 +03:00 |
|
|
|
3d8e1b9c65
|
Web:Studio:Fix loaders settings.
|
2022-04-20 12:45:17 +03:00 |
|
|
|
f72dbca58e
|
Web: Login: fix checkbox wrapper
|
2022-04-20 12:34:21 +03:00 |
|
mushka
|
10090256a2
|
Merge branch 'feature/virtual-rooms-1.2' into feature/modal-redesign
|
2022-04-20 11:11:42 +03:00 |
|
|
|
cc999eddbf
|
Web: Login: delete useless
|
2022-04-19 18:16:43 +03:00 |
|
|
|
48700b3efa
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-19 17:59:13 +03:00 |
|
|
|
1286610463
|
Web:Studio:Fix loader WelcomePageSettings.
|
2022-04-19 17:58:54 +03:00 |
|
|
|
e825bc6b5b
|
Web: Client: NavMenu: fix avatar size
|
2022-04-19 16:10:18 +03:00 |
|
|
|
f60cdb970d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-19 14:20:19 +03:00 |
|
|
|
f7bc235471
|
Web: Client: Home: align tiles
|
2022-04-19 14:20:19 +03:00 |
|
|
|
32ff86acbe
|
Web:Studio:LoaderArticleBody fix styles.
|
2022-04-19 14:19:53 +03:00 |
|
mushka
|
0cafa97440
|
Merge branch 'feature/virtual-rooms-1.2' into feature/modal-redesign
|
2022-04-19 14:18:53 +03:00 |
|
|
|
17dcbec78f
|
Web: Client: NavMenu: hide icon on home
|
2022-04-19 14:13:47 +03:00 |
|
|
|
afb18aa7cc
|
Web:Studio:Removed Automatic time zone setting.
|
2022-04-19 14:05:10 +03:00 |
|
Vashchuk Nikita
|
13fddb0dd2
|
fix
|
2022-04-19 14:02:06 +03:00 |
|
|
|
ebff3a8f80
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-19 13:41:21 +03:00 |
|
|
|
c2b75de71b
|
Web: Client: fixed settingsModule
|
2022-04-19 12:42:36 +03:00 |
|
|
|
4b21b34f58
|
Web: Login: fix show error
|
2022-04-19 12:25:25 +03:00 |
|
|
|
9cfc7da713
|
Web: Client: removed route to settings for personal
|
2022-04-19 12:19:55 +03:00 |
|
|
|
b6d838eaa3
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-19 11:16:50 +03:00 |
|
|
|
c392c3ae62
|
Web:Studio:Added HOC withLoading, removed HOC withCultureNames, added mapCulturesToArray function, refactoring.
|
2022-04-19 11:14:00 +03:00 |
|
|
|
9d8083f1ed
|
Web:Studio: Removed setIsLoadingArticleSettings.
|
2022-04-19 10:45:45 +03:00 |
|
|
|
cec7ce193c
|
Web:Studio:Added CommonStore.
|
2022-04-19 10:45:15 +03:00 |
|
|
|
83cdd51272
|
Web:Components: Removed LoaderSubmenu.
|
2022-04-19 10:44:38 +03:00 |
|
|
|
f146c36274
|
Web:Studio:Added LoaderArticleBody.
|
2022-04-19 10:44:10 +03:00 |
|
|
|
323f17da3a
|
Web:Studio:Added loadBaseInfo.
|
2022-04-19 10:43:35 +03:00 |
|
|
|
e0f8e6eea4
|
Web:Studio:Added HOC withLoading.
|
2022-04-19 10:26:48 +03:00 |
|
|
|
f48809b13a
|
Web:Components:Added HOC withLoading.
|
2022-04-19 10:25:22 +03:00 |
|
|
|
3344a1652e
|
Web:Studio:Added HOC withLoading.
|
2022-04-19 10:22:21 +03:00 |
|
Artem Tarasov
|
3c648cd2b5
|
Web: Doceditor: deleted unnecessary packages
|
2022-04-19 02:28:35 +03:00 |
|
mushka
|
67cb03cc46
|
redesign of all dialogs
|
2022-04-18 16:41:17 +03:00 |
|
Timofey Boyko
|
d6fcc35703
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-18 15:11:50 +03:00 |
|
Timofey Boyko
|
f927aaacb3
|
Web:Studio: add check theme key from local storage
|
2022-04-18 14:47:31 +03:00 |
|
Timofey Boyko
|
f14712dde1
|
Web:Studio:Shell: update check theme method
|
2022-04-18 12:13:45 +03:00 |
|
|
|
58f88b94ad
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-18 11:23:56 +03:00 |
|
|
|
c225e5b90a
|
Web: Client: Settings: fix title width
|
2022-04-18 11:23:47 +03:00 |
|
Timofey Boyko
|
35f8826dec
|
Web:Studio: add action check of user actions for profile menu
|
2022-04-18 11:03:44 +03:00 |
|
|
|
c0406b0727
|
Web: Client: Settings: fix checkbox area click
|
2022-04-17 19:53:14 +03:00 |
|
|
|
3ab0bdd11f
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-04-15 20:34:36 +03:00 |
|
Timofey Boyko
|
5ef5873978
|
Merge branch 'feature/redesign-profile-menu' of github.com:ONLYOFFICE/AppServer into feature/redesign-profile-menu
|
2022-04-15 19:04:19 +03:00 |
|
Timofey Boyko
|
7f6db27bf8
|
Web:Studio:ProfileMenu: change top and right indents for dropdown container
|
2022-04-15 19:03:43 +03:00 |
|
Timofey Boyko
|
216896b421
|
Web:Studio:ProfileMenu: delete useless code
|
2022-04-15 18:59:12 +03:00 |
|
Timofey Boyko
|
1d68ac11b2
|
Web:Studio:ProfileMenu: add control panel for mobile devices
|
2022-04-15 18:58:48 +03:00 |
|
|
|
b5b49d7bc9
|
Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-profile-menu
|
2022-04-15 18:31:51 +03:00 |
|
|
|
7dbc67f0e1
|
Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign
|
2022-04-15 18:13:54 +03:00 |
|
|
|
d8cefc614f
|
Web: Editor: Added icons url.
|
2022-04-15 17:59:39 +03:00 |
|
Timofey Boyko
|
8176228189
|
Web:Studio:NavMenu: add mobile view for profile menu
|
2022-04-15 16:41:01 +03:00 |
|
|
|
34ef545449
|
Web: Backup: Fixed buttons styles.
|
2022-04-15 16:07:56 +03:00 |
|
|
|
e7e34ba101
|
Web: Backup: Fixed styles for empty list.
|
2022-04-15 16:02:18 +03:00 |
|
|
|
4e0f74f839
|
Web: Editor: Disabled button when file name is empty.
|
2022-04-15 14:58:27 +03:00 |
|
Timofey Boyko
|
515839ae4f
|
Web:Studio:ProfileAction: add 'key' for logount button
|
2022-04-15 14:38:06 +03:00 |
|
Timofey Boyko
|
a05408c1cc
|
Web:Studio:NavMenu: redesign logout button
|
2022-04-15 14:14:55 +03:00 |
|
Artem Tarasov
|
f4611388c3
|
Web: Doceditor: added compression
|
2022-04-15 13:56:04 +03:00 |
|
Timofey Boyko
|
2f409bfad5
|
Web:Studio:NavMenu: remove toggle theme from profile menu
|
2022-04-15 13:54:14 +03:00 |
|
Timofey Boyko
|
f20600c5c7
|
Web:Studio:NavMenu: remova top-arrow of profile menu
|
2022-04-15 13:49:25 +03:00 |
|
Timofey Boyko
|
bde27048dc
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-15 13:42:50 +03:00 |
|
|
|
e603b26caa
|
refactoring
|
2022-04-15 13:27:48 +03:00 |
|
|
|
cb2580dd50
|
refactoring
|
2022-04-15 12:08:06 +03:00 |
|
|
|
ce73b308e3
|
Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign
|
2022-04-15 11:46:28 +03:00 |
|
Artem Tarasov
|
4d3e3c3840
|
Web: Doceditor: fixed warnings
|
2022-04-15 11:24:55 +03:00 |
|
Artem Tarasov
|
4a898fc958
|
Web: Doceditor: simplify render
|
2022-04-15 11:24:14 +03:00 |
|
|
|
989037866e
|
Web: Files: Optimization, refactoring.
|
2022-04-15 10:13:23 +03:00 |
|
Artem Tarasov
|
70b07818f2
|
Web: Doceditor: fixed start script
|
2022-04-15 01:49:51 +03:00 |
|
|
|
6ecc8e7071
|
code cleanup
|
2022-04-14 22:42:15 +03:00 |
|
|
|
f138ff7c79
|
fixed warnings
|
2022-04-14 22:23:57 +03:00 |
|
Artem Tarasov
|
1175fc3217
|
Web: Doceditor: deleted unnecessary code
|
2022-04-14 18:54:14 +03:00 |
|
Artem Tarasov
|
ac4873e7dc
|
Web: Doceditor: fixed async useEffect
|
2022-04-14 18:15:09 +03:00 |
|
Artem Tarasov
|
425fff8952
|
Web: Doceditor: fixed warnings
|
2022-04-14 18:14:46 +03:00 |
|
|
|
9e611da373
|
Web: Client: Settings: fix
|
2022-04-14 15:22:28 +03:00 |
|
|
|
26947072c6
|
Merge branch 'feature/backend-refactor' into feature/warnings
# Conflicts:
# common/ASC.Common/Threading/DistributedTaskProgress.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Core.Common/Configuration/AmiPublicDnsSyncService.cs
# common/ASC.Core.Common/Notify/Engine/NotifyRequest.cs
# common/ASC.Core.Common/Notify/Model/NotifyClientImpl.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.Data.Storage/StaticUploader.cs
# products/ASC.Files/Core/ApiModels/ResponseDto/FileDto.cs
# products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.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/Thirdparty/Box/BoxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/docusignhandler.ashx.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/FileOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# web/ASC.Web.Core/CollaboratorSettings.cs
# web/ASC.Web.Core/CustomNavigationSettings.cs
# web/ASC.Web.Core/EmailActivationSettings.cs
# web/ASC.Web.Core/Notify/NotifyConfiguration.cs
# web/ASC.Web.Core/Notify/SpamEmailSettings.cs
# web/ASC.Web.Core/Notify/StudioNotifyHelper.cs
# web/ASC.Web.Core/Notify/StudioNotifyService.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
# web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
# web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs
# web/ASC.Web.Core/PersonalSettings.cs
# web/ASC.Web.Core/PrivacyRoomSettings.cs
# web/ASC.Web.Core/PromotionsSettings.cs
# web/ASC.Web.Core/QuotaSync.cs
# web/ASC.Web.Core/Sms/SmsSender.cs
# web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
# web/ASC.Web.Core/StudioAdminMessageSettings.cs
# web/ASC.Web.Core/StudioDefaultPageSettings.cs
# web/ASC.Web.Core/StudioTrustedDomainSettings.cs
# web/ASC.Web.Core/TariffSettings.cs
# web/ASC.Web.Core/Tfa/TfaAppAuthSettings.cs
# web/ASC.Web.Core/Tfa/TfaAppUserSettings.cs
# web/ASC.Web.Core/TipsSettings.cs
# web/ASC.Web.Core/Users/CustomNamingPeople.cs
# web/ASC.Web.Core/Users/UserHelpTourSettings.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
# web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
# web/ASC.Web.Core/Users/UserPhotoThumbnailSettings.cs
# web/ASC.Web.Core/Utility/ColorThemesSettings.cs
# web/ASC.Web.Core/Utility/PasswordSettings.cs
# web/ASC.Web.Core/Utility/Settings/TenantAccessSettings.cs
# web/ASC.Web.Core/Utility/Settings/WebItemSettings.cs
# web/ASC.Web.Core/Utility/Settings/WizardSettings.cs
# web/ASC.Web.Core/Utility/TenantExtra.cs
# web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs
# web/ASC.Web.Core/WhiteLabel/CompanyWhiteLabelSettings.cs
# web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-04-14 15:21:06 +03:00 |
|
|
|
8674260bcb
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
# Conflicts:
# web/ASC.Web.Client/tests/action_tests.js
|
2022-04-14 14:42:35 +03:00 |
|
Artem Tarasov
|
7675e1381c
|
Web: Doceditor: deleted unnecessary code, refactoring
|
2022-04-14 14:42:03 +03:00 |
|
|
|
cc34c5b3c5
|
Web: Client: Tests: add custom scenario for tfa
|
2022-04-14 13:25:09 +03:00 |
|
|
|
1c8094139f
|
Web: Client: Tests: add mock
|
2022-04-14 13:24:35 +03:00 |
|
|
|
d2178d4f85
|
Web: Client: Settings: fix tfa logic
|
2022-04-14 12:46:58 +03:00 |
|
|
|
2359ac34c9
|
Web: Client: SettingsStore: add setIsInit
|
2022-04-14 12:41:59 +03:00 |
|
|
|
7c93072aae
|
Web: Files: SelectFolderDialog/SelectFileDialog: Fixed aside styles.
|
2022-04-14 11:18:04 +03:00 |
|
|
|
6ddeff2d51
|
Web: Files: SelectFolderDialog/SelectFileDialog: Fixed styles according layouts.
|
2022-04-14 11:03:31 +03:00 |
|
|
|
49145aa463
|
Web: Files: Changed titles of dialogs, added isLoading prop for tree component.
|
2022-04-13 16:09:37 +03:00 |
|
|
|
65df8f6bfc
|
Web: Client: Settings: move checkWidth
|
2022-04-13 15:32:15 +03:00 |
|
|
|
b5845e221c
|
Web: Client: Settings: use isSaving
|
2022-04-13 15:18:23 +03:00 |
|
|
|
816e25772c
|
Web: Client: add command
|
2022-04-13 14:52:30 +03:00 |
|
|
|
1dcc6b035b
|
Web: Client: Tests: fix action tests
|
2022-04-13 14:52:11 +03:00 |
|
|
|
6ff7c9b09d
|
Web: Client: Tests: fix mock
|
2022-04-13 14:51:52 +03:00 |
|
|
|
7a9e914a55
|
Web: Client: Settings: fix init
|
2022-04-13 14:51:14 +03:00 |
|
Artem Tarasov
|
0b19cf90f2
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-04-13 11:42:49 +03:00 |
|
Artem Tarasov
|
81e6a2d04a
|
Web: Doceditor: added and applied preparationPortalDialog
|
2022-04-13 11:36:30 +03:00 |
|
Artem Tarasov
|
172cb031b6
|
Web: Doceditor: fixed opening by link without authorization
|
2022-04-13 10:40:49 +03:00 |
|
Timofey Boyko
|
792bd7065f
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-04-13 10:22:20 +03:00 |
|
|
|
4828678e03
|
merge from feature/backend-refactor
|
2022-04-12 22:04:10 +03:00 |
|
|
|
f9720af935
|
Settings: EnableAdmMess
|
2022-04-12 21:26:32 +03:00 |
|
|
|
270731b8ee
|
Web" Client: Tests: fix id
|
2022-04-12 20:56:53 +03:00 |
|
|
|
4b194e5441
|
Web: Client: Settings: fix user field id
|
2022-04-12 20:50:58 +03:00 |
|
|
|
a9833a0cbc
|
Web: Client: Settings: init settings
|
2022-04-12 20:44:32 +03:00 |
|
mushka
|
ddc7b56d00
|
Merge branch 'feature/virtual-rooms-1.2' into feature/modal-redesign
|
2022-04-12 18:03:30 +03:00 |
|
|
|
0bfffed690
|
Web: Files: Refactoring, deleted useless code.
|
2022-04-12 16:17:44 +03:00 |
|
|
|
e4472c18a7
|
Merge branch 'feature/admin-messages' of github.com:ONLYOFFICE/AppServer into feature/session-lifetime
|
2022-04-12 14:23:30 +03:00 |
|
|
|
95b3f789bd
|
Web: Client: NavMenu: fix
|
2022-04-12 14:21:59 +03:00 |
|
|
|
a7b507bc0f
|
Web: Client: RecoverAccess: use themes
|
2022-04-12 14:21:03 +03:00 |
|
|
|
ea6f80987f
|
Web: Client: NavMenu: fix style
|
2022-04-12 14:15:13 +03:00 |
|
|
|
8a9fbe70c6
|
Web: Files: Added reset of tree.
|
2022-04-12 13:52:23 +03:00 |
|
|
|
d13180982d
|
Web: Client: Settings: add logic
|
2022-04-12 13:36:55 +03:00 |
|
|
|
193c1b2c9c
|
Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign
|
2022-04-12 12:01:25 +03:00 |
|
|
|
3115ce4aec
|
Web: Client: Settings: getSessionLifetime
|
2022-04-12 11:35:32 +03:00 |
|
|
|
523c79a3ec
|
Web: Client: Settings: use SaveCancelButtons
|
2022-04-12 11:33:35 +03:00 |
|
|
|
d61612fdf5
|
Merge branch 'feature/admin-messages' of github.com:ONLYOFFICE/AppServer into feature/session-lifetime
# Conflicts:
# packages/asc-web-common/store/AuthStore.js
|
2022-04-12 11:31:41 +03:00 |
|
|
|
59e0e53d19
|
Web: Client: Settings: use SaveCancelButtons
|
2022-04-12 11:30:43 +03:00 |
|
|
|
c62b18b68b
|
Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
|
2022-04-12 11:28:54 +03:00 |
|
|
|
ce7ac083ca
|
Web: Client: Settings: fix ip regex
|
2022-04-12 10:41:00 +03:00 |
|
|
|
b31015bddd
|
fix portalrename
|
2022-04-12 09:28:49 +03:00 |
|
|
|
50655ae61c
|
added portal rename method
|
2022-04-11 18:19:56 +03:00 |
|
|
|
27af58022d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-04-11 17:10:12 +03:00 |
|
|
|
44c2a267d4
|
Web: Client: Settings: fix get ip restriction enable
|
2022-04-11 17:07:05 +03:00 |
|
|
|
866a6f6c26
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 16:37:37 +03:00 |
|
|
|
fdfdf4e547
|
Web:Studio:Fix border width.
|
2022-04-11 16:10:12 +03:00 |
|
|
|
eaf365de0f
|
Web: Client: Settings: add try/catch
|
2022-04-11 13:27:37 +03:00 |
|
Timofey Boyko
|
63c812cbf0
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 13:22:22 +03:00 |
|
Timofey Boyko
|
9c01f05de8
|
Web:Studio:Settings: hide article when catalog item changed
|
2022-04-11 13:22:04 +03:00 |
|
|
|
c33e724a3d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 12:28:02 +03:00 |
|
|
|
01e745f47b
|
Web:Studio:Fix loaders styles.
|
2022-04-11 12:26:58 +03:00 |
|
|
|
b33fe33f18
|
Web: Client: Settings: fix show warning
|
2022-04-11 12:15:47 +03:00 |
|
|
|
f3a144327a
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-04-11 12:09:59 +03:00 |
|
|
|
433c684d09
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 12:08:50 +03:00 |
|
|
|
8f623ae40a
|
Web: Files: Fixed styles.
|
2022-04-11 11:20:38 +03:00 |
|
|
|
d07c5e071e
|
Web: Files: Renamed function, refactoring.
|
2022-04-11 11:14:05 +03:00 |
|
|
|
38aa42fdf8
|
Web: Files: Refactoring, deleted useless code.
|
2022-04-11 10:30:23 +03:00 |
|
|
|
70ee53b5cb
|
Web: Files: SelectFolder: Added "canCreate" prop.
|
2022-04-11 09:42:42 +03:00 |
|
|
|
751e2b2bd1
|
Web: Files: SelectFolder: Fixed styles of aside view, refactoring.
|
2022-04-11 09:01:18 +03:00 |
|
|
|
952996f534
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-10 20:08:22 +03:00 |
|
|
|
a2c1e836c0
|
Web:Studio:Added LoaderSubmenu.
|
2022-04-10 19:57:43 +03:00 |
|
|
|
34f223d67c
|
Web:Studio:Added LoaderSectionHeader.
|
2022-04-10 19:24:05 +03:00 |
|
Artem Tarasov
|
8a7c3accc8
|
Web: Doceditor: fixed show message
|
2022-04-10 17:25:02 +03:00 |
|
Artem Tarasov
|
64b8f469b4
|
Web: Doceditor: fixed init, deleted unnecessary code
|
2022-04-10 17:24:34 +03:00 |
|
|
|
b20f4cfed1
|
Web: Backup: Added new translation.
|
2022-04-10 13:14:40 +03:00 |
|
|
|
34d4b5dbaa
|
Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign
|
2022-04-10 12:29:24 +03:00 |
|
|
|
87e1222783
|
Web: Files: SelectFile: Changed logic.
|
2022-04-08 17:12:48 +03:00 |
|
|
|
b0a64cbac7
|
Web: Client: Settings: fix after merge
|
2022-04-08 16:54:26 +03:00 |
|
|
|
3f70481d3a
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
# Conflicts:
# packages/asc-web-common/store/AuthStore.js
|
2022-04-08 16:51:26 +03:00 |
|
|
|
21489279b4
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
# Conflicts:
# web/ASC.Web.Client/src/store/SettingsSetupStore.js
|
2022-04-08 16:42:11 +03:00 |
|
|
|
d2ba43ce4b
|
Web:Studio:Added setIsLoadingArticleSettings method.
|
2022-04-08 16:37:33 +03:00 |
|
|
|
f835484454
|
Web: Client: Settings: fix width
|
2022-04-08 16:12:34 +03:00 |
|
|
|
b2d162b630
|
Web: Client: Settings: use SaveCancelButtons
|
2022-04-08 16:01:03 +03:00 |
|
|
|
9aa95c6462
|
Web: Client: fix isSaving
|
2022-04-08 15:18:58 +03:00 |
|
|
|
136fa429b7
|
Web: Client: Settings: return isLoading
|
2022-04-08 15:01:53 +03:00 |
|
|
|
9932e76cc4
|
Web: Refactoring, added styles.
|
2022-04-08 14:25:26 +03:00 |
|
Vashchuk Nikita
|
df86859903
|
fix
|
2022-04-08 13:44:41 +03:00 |
|
Vashchuk Nikita
|
7f155066cf
|
fix
|
2022-04-08 13:44:18 +03:00 |
|
|
|
e251a58ad0
|
Web: Client: Settings: add button loader
|
2022-04-08 13:33:50 +03:00 |
|
|
|
3fc58edcb9
|
Web: Client: init settings outside shell
|
2022-04-08 13:19:50 +03:00 |
|
|
|
d04de3b4f7
|
Web: Client: Settings: delete console
|
2022-04-08 12:33:03 +03:00 |
|
|
|
4a3325b988
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-08 12:24:25 +03:00 |
|
|
|
797c71551b
|
Web: Client: move init tfa to setupStore
|
2022-04-08 12:23:54 +03:00 |
|
|
|
b72d14dc98
|
Web: Client: Tests: add trusted mail settings change test server error
|
2022-04-08 12:09:12 +03:00 |
|
|
|
f9c5bc65ce
|
Web: Client: Settings: delete useless
|
2022-04-07 22:04:16 +03:00 |
|
Artem Tarasov
|
12109188bb
|
Web: Doceditor: deleted unnecessary code
|
2022-04-07 21:08:10 +03:00 |
|
Artem Tarasov
|
fe448353a8
|
Web: Doceditor: added ErrorBoundary component
|
2022-04-07 20:41:33 +03:00 |
|
|
|
54fb5f3ab7
|
Web: Client: Settings: fix
|
2022-04-07 20:39:58 +03:00 |
|
|
|
8ccb5bd793
|
Web: Client: Settings add try/catch
|
2022-04-07 20:38:13 +03:00 |
|
|
|
851614569f
|
Web: Client: Settings: fix header title
|
2022-04-07 18:33:39 +03:00 |
|
|
|
d5f3b4f0e6
|
Web:Studio:Added loaderCustomization, loaderCustomizationNavbar, loaderDescriptionCustomization.
|
2022-04-07 18:23:33 +03:00 |
|
|
|
7e5e4f5c48
|
Web: Client: Settings: add session lifetime layout
|
2022-04-07 18:19:57 +03:00 |
|
|
|
46b98bc243
|
Web: Client: Settings: delete useless
|
2022-04-07 17:55:14 +03:00 |
|
|
|
a77ef07e8e
|
Web: Client: Settings: init session lifetime
|
2022-04-07 17:46:43 +03:00 |
|
|
|
74f4ade853
|
Web: Client: add settings translate
|
2022-04-07 17:41:24 +03:00 |
|
|
|
ae8da903a8
|
Web: Client: Settings: fix category wrapper
|
2022-04-07 17:33:58 +03:00 |
|
|
|
ab0404e1dc
|
Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
|
2022-04-07 17:32:15 +03:00 |
|
|
|
c7a8ca7309
|
Web: Client: Settings: fix category wrapper
|
2022-04-07 17:27:52 +03:00 |
|
|
|
b7d45c2e66
|
Merge branch 'feature/trusted-mail' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-04-07 17:24:39 +03:00 |
|
|
|
a97b34d144
|
Web: Client: Settings: delete useless
|
2022-04-07 16:23:33 +03:00 |
|
|
|
eeac7377be
|
Web: Client: delete useless
|
2022-04-07 16:19:08 +03:00 |
|
|
|
0e4d12236e
|
Web: Client: Settings: fix header title
|
2022-04-07 14:26:13 +03:00 |
|
|
|
0581bf7b49
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-07 14:21:17 +03:00 |
|
|
|
0d612a5330
|
Web: Client: Settings: add learn more link in tooltip
|
2022-04-07 14:20:20 +03:00 |
|
|
|
fae0973b4a
|
Web: Client: fix show errors
|
2022-04-07 14:04:13 +03:00 |
|
|
|
f9da8e4026
|
iprestrictions
fix Verify
add check enable
add api method
|
2022-04-07 13:19:30 +03:00 |
|
|
|
5c93fd9fbf
|
Web: Client: Settings: fix
|
2022-04-07 12:48:18 +03:00 |
|
|
|
2962c0ca38
|
Merge branch 'feature/trusted-mail' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-04-07 04:10:15 +03:00 |
|
|
|
a44eaa9ea5
|
Web: Client: Settings: add admin message setting layout, logic
|
2022-04-07 04:03:37 +03:00 |
|
|
|
b07ebbce3b
|
Web: Client: delete useless
|
2022-04-07 04:02:53 +03:00 |
|
|
|
e2e335ae90
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-06 22:27:44 +03:00 |
|
|
|
a68d6ffcdf
|
Web:Studio:Added PortalRenaming to settingsTree. Refactoring Customization.
|
2022-04-06 22:27:25 +03:00 |
|
|
|
c6b81c6e94
|
Merge branch 'feature/virtual-rooms-1.2' into feature/trusted-mail
|
2022-04-06 21:32:36 +03:00 |
|
|
|
8252bce310
|
Fix Bug 54901 - Docs: Desktop. infinite loader on Linux
|
2022-04-06 20:26:20 +03:00 |
|
|
|
3ef7ae85de
|
Web: SelectFolder: Optimization, refactoring.
|
2022-04-06 18:04:43 +03:00 |
|
|
|
8efae2617d
|
Web: Client: Settings: init admin message setting
|
2022-04-06 17:10:49 +03:00 |
|
|
|
2db86b4d71
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-06 17:08:18 +03:00 |
|
|
|
1755d03b4e
|
Web:Studio:Styling Settings. Added locales en PortalRenamingMobile.
|
2022-04-06 17:07:48 +03:00 |
|
|
|
92899d14df
|
Web: Client: add settings translate
|
2022-04-06 17:04:49 +03:00 |
|
|
|
ca7c998e69
|
Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
|
2022-04-06 16:54:22 +03:00 |
|
|
|
5ac990887b
|
Web: Client: fixed ProfileActions
|
2022-04-06 15:56:51 +03:00 |
|
|
|
fa397a1511
|
Web: Client: Settings: ipSecurity add layout and logic
|
2022-04-06 14:13:15 +03:00 |
|
|
|
ae3aff5576
|
Web: Client: delete useless
|
2022-04-06 14:09:52 +03:00 |
|
|
|
48240c6f77
|
Web:Studio:Added locales en PleaseNote, PleaseNoteDescription, PortalRenaming, PortalRenamingDescription, PortalRenamingDescriptionTooltip, PortalRenamingLabelText, PortalRenamingSettingsTooltip. Added tooltip PortalRenamingTooltip.
|
2022-04-06 12:37:15 +03:00 |
|
|
|
d6e317e7d3
|
Web: Client: Settings: init ip security setting
|
2022-04-06 12:35:38 +03:00 |
|
|
|
08d7647bbe
|
Web: Client: add settings translates
|
2022-04-06 12:24:35 +03:00 |
|
|
|
2c4c61a341
|
Web: Client: Settings: add id
|
2022-04-06 12:02:29 +03:00 |
|
|
|
33001bf8f7
|
Web: Client: Tests: add trusted mail settings change tests
|
2022-04-06 12:01:47 +03:00 |
|
|
|
1cb67aacdb
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-06 11:32:46 +03:00 |
|
|
|
7ec70e37fa
|
Web: Client: Settings: show error
|
2022-04-06 11:32:29 +03:00 |
|
|
|
ef7a1be29d
|
Web: Client: Settings: fix session logic
|
2022-04-06 10:58:35 +03:00 |
|
|
|
5e890f81c9
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-05 23:05:08 +03:00 |
|
|
|
1137946577
|
Web:Studio:Added functionality to the PortalRenaming component.
|
2022-04-05 23:04:50 +03:00 |
|
|
|
fa9b365211
|
Web:Studio:Added the PORTAL_RENAMING route.
|
2022-04-05 23:03:42 +03:00 |
|
|
|
7deb741978
|
Web:Studio:Added SuccessfullySavePortalNameMessage locales en.
|
2022-04-05 23:02:45 +03:00 |
|
|
|
4960c16805
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-05 18:05:12 +03:00 |
|
|
|
3b7c80b7b8
|
Web: Client: Settings: fix
|
2022-04-05 17:59:50 +03:00 |
|
|
|
b97ad7459a
|
Web: Client: Settings: fix btn size
|
2022-04-05 17:27:48 +03:00 |
|
|
|
c79f294bb3
|
Web: Client: Settings: fix
|
2022-04-05 17:21:04 +03:00 |
|
|
|
adeff36777
|
Web: Client: Settings: use session storage for tfa
|
2022-04-05 16:42:44 +03:00 |
|
|
|
6f28c9d187
|
Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-05 16:33:20 +03:00 |
|
|
|
e13661c109
|
Web: Client: Settings: use session storage
|
2022-04-05 16:32:41 +03:00 |
|
|
|
d98ba7574c
|
Web: Client: Settings: use session storage
|
2022-04-05 16:13:54 +03:00 |
|
|
|
ccbd8c88f5
|
Web: Client: Settings: use settings store
|
2022-04-05 15:35:59 +03:00 |
|
|
|
5725a87887
|
Web: Client: Settings: use data from store
|
2022-04-05 14:41:16 +03:00 |
|
|
|
47199aca82
|
Web: Client: Settings: fix dark theme
|
2022-04-05 13:29:02 +03:00 |
|
|
|
c7edba4cad
|
Web: Client: Settings: add redirect
|
2022-04-05 12:25:25 +03:00 |
|
|
|
9a1ba0a597
|
Web: Client: Settings: fix learn more
|
2022-04-05 11:59:28 +03:00 |
|
|
|
7645d0bb1c
|
Web: Client: Settings: delete useless after merge
|
2022-04-05 11:20:28 +03:00 |
|
|
|
331ab31e02
|
Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/passwordStrength.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/tfa.js
|
2022-04-05 11:18:28 +03:00 |
|
|
|
5917b4dcb9
|
Web: Client: Settings: add learn more wrapper
|
2022-04-05 11:15:58 +03:00 |
|
|
|
f818a364aa
|
Web: Client: Settings: get settings from store
|
2022-04-05 11:10:07 +03:00 |
|
Artem Tarasov
|
536e65c1c0
|
Web: Doceditor: refactoring, fixed create copy, canConvert
|
2022-04-05 02:19:30 +03:00 |
|
|
|
6fef466d23
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/password-strength
|
2022-04-04 22:12:05 +03:00 |
|
|
|
5b825dc6ac
|
Merge pull request #579 from ONLYOFFICE/feature/add-units
add new lines
|
2022-04-04 19:38:45 +03:00 |
|
|
|
45d2a31d03
|
Merge branch 'feature/virtual-rooms-1.2' into feature/add-units
# Conflicts:
# public/locales/de/Common.json
|
2022-04-04 19:34:51 +03:00 |
|
|
|
9ce0f807c5
|
Web: Client: Settings: show loader
|
2022-04-04 19:31:43 +03:00 |
|
|
|
cb2d6653a8
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-04 19:30:42 +03:00 |
|
|
|
17787d55ad
|
Web: Fixed toast error for backup
|
2022-04-04 19:27:53 +03:00 |
|
|
|
d0d2abecea
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-04 19:27:44 +03:00 |
|
|
|
d7ec0e118c
|
Web:Studio:Add PortalRenaming.
|
2022-04-04 19:27:24 +03:00 |
|
|
|
f70f51df64
|
Web: Client: Settings: fix style
|
2022-04-04 19:14:27 +03:00 |
|
|
|
70d41327c9
|
Web: Client: Settings: fix style
|
2022-04-04 19:09:42 +03:00 |
|
|
|
ac5c548fff
|
Web: Fixed toastr for backup.
|
2022-04-04 19:03:58 +03:00 |
|
|
|
31011bdbc6
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/password-strength
# Conflicts:
# web/ASC.Web.Client/tests/action_tests.js
|
2022-04-04 17:12:54 +03:00 |
|
|
|
fd2f767063
|
Web: Client: fix mobile view size
|
2022-04-04 17:12:02 +03:00 |
|
|
|
f677b0e484
|
Web: Client: delete space
|
2022-04-04 17:11:44 +03:00 |
|
|
|
d866dfecfb
|
Web: Client: fix
|
2022-04-04 16:59:38 +03:00 |
|
Artem Tarasov
|
3d78fd6576
|
Web: Doceditor/Files: deleted unnecessary code
|
2022-04-04 16:41:55 +03:00 |
|
|
|
1ff94b3d0c
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-04 15:53:01 +03:00 |
|
|
|
3016f43fab
|
Web:Studio:Added Welcome Page Settings mobile render test, Welcome Page Settings Restore to Default button test, Welcome Page Settings Save button test.
|
2022-04-04 15:52:41 +03:00 |
|
|
|
1252ccfc38
|
Web:Studio:Added id for TextInput and SaveCancelButtons.
|
2022-04-04 15:50:10 +03:00 |
|
|
|
fefad51e53
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-04 15:43:07 +03:00 |
|
|
|
4934edcfba
|
Web:Fixed backup styles after merge.
|
2022-04-04 15:40:45 +03:00 |
|
Timofey Boyko
|
d4b24c6ed7
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-04 15:34:52 +03:00 |
|
|
|
04907c4532
|
Web: Client: add missed paths
|
2022-04-04 15:11:09 +03:00 |
|
Timofey Boyko
|
6e2c8f0a13
|
Web:Studio:NavMenu: add avatar and change position of catalog-burger for mobile devices
|
2022-04-04 15:03:53 +03:00 |
|
|
|
e49cbbd0fe
|
Web: Client: Settings: fix logic
|
2022-04-04 14:45:13 +03:00 |
|
Timofey Boyko
|
9b46a23930
|
Web:Studio:NavMenu: fix styles of avatar for mobile devices
|
2022-04-04 14:37:36 +03:00 |
|
Timofey Boyko
|
fc09b493ed
|
Web:Studio:NavMenu: delete useless code from profile-actions
|
2022-04-04 14:36:45 +03:00 |
|
|
|
c5ccec3087
|
Web: Client: Settings: add logic
|
2022-04-04 14:28:15 +03:00 |
|
Timofey Boyko
|
81f4f60448
|
Web:Studio:NavMenu: add dark mode toggler
|
2022-04-04 13:30:49 +03:00 |
|
|
|
bd7ebe0238
|
Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-04 12:35:36 +03:00 |
|
Artem Tarasov
|
7d5a97ffb8
|
Web: Doceditor: applied changes from DynamicComponent
|
2022-04-04 11:47:40 +03:00 |
|
Artem Tarasov
|
c1fb9dd8d4
|
Web: Editor: refactoring DynamicComponent
|
2022-04-04 11:47:06 +03:00 |
|
|
|
f3e75773cb
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/password-strength
|
2022-04-04 11:36:38 +03:00 |
|
|
|
bdade9be9b
|
Web: Client: Settings: fix
|
2022-04-04 11:36:23 +03:00 |
|
|
|
e38441d5fc
|
Web: Client: Tests: add password strength change test error
|
2022-04-04 11:36:01 +03:00 |
|
|
|
b4533f6089
|
Web: Client: fix settings translates
|
2022-04-04 11:22:07 +03:00 |
|
|
|
06e9e79f65
|
Web:Studio:Added Submenu.
|
2022-04-04 11:01:30 +03:00 |
|
|
|
0c4bcb2399
|
Web: Client: Settings: move buttons to component
|
2022-04-03 22:18:53 +03:00 |
|
|
|
ea495d2b13
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-03 22:12:30 +03:00 |
|
|
|
638cb62520
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-03 19:07:56 +03:00 |
|
|
|
500d5be25c
|
Web:Studio:Opening access to the RestoreDefaultButton button after writing the first name. Adding the isFirstWelcomePageSettings key to localStorage.
|
2022-04-03 18:32:06 +03:00 |
|
|
|
4d53381840
|
Web:Studio:Fix incorrect display of "YouHaveUnsavedChanges" message. Added greetingTitleDefaultFromSessionStorage.
|
2022-04-03 12:18:22 +03:00 |
|
|
|
99aa35b528
|
Web: Client: Settings: fix layout
|
2022-04-02 22:40:22 +03:00 |
|
|
|
30f16c8ab0
|
Web: Client: add settings translates
|
2022-04-02 22:35:01 +03:00 |
|
|
|
327df7e3f1
|
Web: Client: Settings: add trusted mail
|
2022-04-02 22:23:20 +03:00 |
|
|
|
22493d1c3d
|
Web: Client: Settings: add user fields component
|
2022-04-02 22:19:58 +03:00 |
|
|
|
a62959aba1
|
Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-02 22:02:26 +03:00 |
|
