Commit Graph

9482 Commits

Author SHA1 Message Date
65a739d871 Removed ASC.Web.Campaigns (moved to separated repository) 2022-07-11 14:15:51 +03:00
7af929fee8 Merge branch 'release/v1.2' into develop
# Conflicts:
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.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.People/Server/Controllers/PeopleController.cs
#	products/ASC.People/Server/Models/MemberModel.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2022-07-07 17:41:41 +03:00
baa72db316 removed referencies 2022-07-06 18:47:16 +03:00
a615053d88 Fix Bug 58025 - Client.Profile. The languages listed in the profile are not in alphabetical order. 2022-07-06 18:26:25 +03:00
TimofeyBoyko
545e4c0142 Web:Client:ProfileMenu: delete useless code 2022-07-05 19:48:46 +03:00
TimofeyBoyko
02938b9486 Fixed Bug 57943 - Mobile. Available to scroll an inactive section with the 'Profile' menu open 2022-07-05 18:57:36 +03:00
aeac8613a8 Merge branch 'develop' into features/enum_generator 2022-07-05 17:22:43 +03:00
1218d31a42 enum generator 2022-07-05 16:58:11 +03:00
TimofeyBoyko
6acc0ac769 Fixed Bug 57976 - Mobile. Blur effect for all portal page content after screen rotation with 'Profile' menu open 2022-07-05 11:18:29 +03:00
90fe1383b7 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-07-04 18:04:06 +03:00
596ae3b06e Web: Client: Fix Error pages translation 2022-07-04 17:48:06 +03:00
d8a459f397 Web: i18n: Replaced i18next-http-backend package with custom realization from @appserver/common/utils/i18next-http-backend (fix issue: too many same translations files are loading at once) 2022-07-04 17:47:12 +03:00
9a5e05a1f9 Fixed Bug 57948 - Mobile. Hid the click area on the burger 2022-07-04 17:16:02 +03:00
fb09f62881 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-07-04 11:39:38 +03:00
0f901bf6e3 added hy-AM 2022-07-04 11:38:57 +03:00
d6b7db91e3 Web: Translations: Added translations minimization 2022-07-03 13:25:41 +03:00
a289f9594a modified LdapNotifyHelper to BackgroundService 2022-07-01 14:49:59 +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