|
c20a470508
|
People: fix
|
2022-02-10 14:00:53 +03:00 |
|
|
320a1f2250
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Common/Caching/AscCache.cs
# common/ASC.Common/Data/StreamExtension.cs
# common/ASC.Common/Utils/RandomString.cs
# common/ASC.Core.Common/Billing/CouponManager.cs
# common/ASC.Core.Common/Billing/License/LicenseReader.cs
# common/ASC.Core.Common/Core/UserGroupRef.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Core.Common/Notify/Jabber/JabberServiceClientWcf.cs
# common/ASC.Core.Common/Notify/Telegram/Dao/CachedTelegramDao.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
# common/ASC.Data.Storage/BaseStorage.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Notify.Textile/JabberStyler.cs
# common/ASC.Textile/Blocks/GlyphBlockModifier.cs
# common/ASC.Textile/States/TableRowFormatterState.cs
# common/services/ASC.ApiSystem/Classes/CommonMethods.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# common/services/ASC.ClearEvents/Program.cs
# common/services/ASC.TelegramService/Startup.cs
# common/services/ASC.UrlShortener.Svc/Program.cs
# products/ASC.Files/Core/Core/Entries/File.cs
# products/ASC.Files/Core/Core/Entries/FileEntry.cs
# products/ASC.Files/Core/Core/Entries/FileHelper.cs
# products/ASC.Files/Core/Core/Entries/Folder.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
# products/ASC.Files/Core/Helpers/ThirdpartyConfiguration.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Core/Files/DocumentService.cs
# web/ASC.Web.Core/Files/DocumentServiceLicense.cs
# web/ASC.Web.Core/QuotaSync.cs
# web/ASC.Web.Core/Sms/SmsKeyStorage.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# web/ASC.Web.HealthChecks.UI/Program.cs
# web/ASC.Web.Studio/Startup.cs
|
2022-02-10 13:16:33 +03:00 |
|
|
b6d98a8227
|
Merge pull request #516 from ONLYOFFICE/bugfix/U2U1100
Bugfix/u2u1100
|
2022-02-09 13:35:54 +03:00 |
|
|
147377ab65
|
bugfix: crash when string == null
|
2022-02-09 13:32:01 +03:00 |
|
|
b1be9953ad
|
fixed solution build
|
2022-02-07 22:15:32 +03:00 |
|
|
08c6040787
|
Merge pull request #503 from ONLYOFFICE/feature/analizators
Feature/analizators
|
2022-02-07 20:27:17 +03:00 |
|
|
b2079ccace
|
fixed warnings
|
2022-02-07 20:19:58 +03:00 |
|
|
9f5a1f3ba7
|
Merge branch 'develop' into feature/analizators
|
2022-02-07 19:28:23 +03:00 |
|
|
37c88dad50
|
Analyzers: fix
|
2022-02-07 18:10:27 +03:00 |
|
|
812241a69a
|
Analyzers: fix
|
2022-02-07 17:53:58 +03:00 |
|
|
8a90ccc30b
|
Merge pull request #504 from ONLYOFFICE/feature/refactoring
Feature/refactoring
|
2022-02-04 22:42:16 +03:00 |
|
|
e16d75839a
|
Merge branch 'develop' of github.com:ONLYOFFICE/CommunityServer-AspNetCore into develop
|
2022-02-04 21:00:05 +03:00 |
|
|
eed733b83c
|
fixed user photo thumbnail generator
|
2022-02-04 20:59:58 +03:00 |
|
|
19fb0a50da
|
refactoring: delete rule
|
2022-02-03 15:19:53 +03:00 |
|
|
34dab043e0
|
Merge branch 'develop' into feature/analizators
# Conflicts:
# common/ASC.Core.Common/ASC.Core.Common.csproj
|
2022-02-03 12:55:33 +03:00 |
|
|
4661ee96d0
|
Packages updated
|
2022-02-02 19:54:23 +03:00 |
|
|
bb28679fdf
|
analizators: bugfix
|
2022-02-02 14:05:06 +03:00 |
|
|
c2d3d10ec5
|
refactoring : bugfix
|
2022-02-02 13:09:37 +03:00 |
|
|
f6620e34ae
|
Merge branch 'develop' into feature/refactoring
|
2022-02-02 13:09:25 +03:00 |
|
|
5a71df17d3
|
refactoring: bugfix
|
2022-02-02 12:02:49 +03:00 |
|
|
2584fc4042
|
refactoring: remove waste
|
2022-01-31 18:15:43 +03:00 |
|
|
c3c3068d6a
|
refactoring: add globalusings: clearEvents
|
2022-01-31 18:14:29 +03:00 |
|
|
55a9310744
|
refactoring: add globalusings: web.api
|
2022-01-31 18:13:08 +03:00 |
|
|
4f0de0b643
|
refactoring: bugfix
|
2022-01-31 16:59:38 +03:00 |
|
|
5b22e2c7bd
|
refactoring: bugfix
|
2022-01-31 16:57:41 +03:00 |
|
|
58b2c7a840
|
refactoring: edit rule
|
2022-01-31 16:57:12 +03:00 |
|
|
7ab885b2e2
|
refactoring: bugfix
|
2022-01-31 16:56:30 +03:00 |
|
|
17cb4a647b
|
analizators: bugfix
|
2022-01-31 14:35:59 +03:00 |
|
|
34ff334692
|
Merge branch 'develop' into feature/analizators
|
2022-01-31 14:35:16 +03:00 |
|
|
6f93f3c6cb
|
refactoring:add globalusings: webhooks.service
|
2022-01-31 11:37:25 +03:00 |
|
|
655c70948d
|
refactoring: add globalusings: webhooks.core
|
2022-01-31 11:35:57 +03:00 |
|
|
01831ad0b6
|
refactoring: add globalusings: web.studio
|
2022-01-31 11:33:18 +03:00 |
|
|
0f6ec5f532
|
refactoring: add globalusings: web.healthChecks.ui
|
2022-01-31 11:31:43 +03:00 |
|
|
cefa25a391
|
refactoring: add globalusings: web.core
|
2022-01-31 11:30:08 +03:00 |
|
|
8795f5b7f0
|
refactoring: add globalusings: voipService
|
2022-01-30 01:47:06 +03:00 |
|
|
5e2c2fc2e0
|
refactoring: add globalusings: urlShortener
|
2022-01-30 01:40:50 +03:00 |
|
|
c3086a4d54
|
refactoring: add globalusings: textile
|
2022-01-30 01:34:56 +03:00 |
|
|
3068883ec8
|
refactoring: add globalusing: telegramService
|
2022-01-30 01:24:30 +03:00 |
|
|
74bf6bf7a0
|
refactoring: add globalusings: studio.notify
|
2022-01-30 01:17:12 +03:00 |
|
|
ff854ae971
|
refactoring: add globalusings: people
|
2022-01-30 01:13:42 +03:00 |
|
|
646356fed5
|
refactoring: add globalusings: notify.textile
|
2022-01-30 01:00:02 +03:00 |
|
|
5c14db512a
|
refactoring: add globalusings: notify
|
2022-01-30 00:53:20 +03:00 |
|
|
8ea4833858
|
refactoring: add globalusings: messagingSystem
|
2022-01-30 00:48:12 +03:00 |
|
|
45ed0db3f7
|
refactoring: add globalusings: IPSecurity
|
2022-01-30 00:41:43 +03:00 |
|
|
73dcc81db4
|
refactoring: add globalusings: files.service
|
2022-01-30 00:37:07 +03:00 |
|
|
8428ef730c
|
Merge pull request #498 from ONLYOFFICE/feature/accessRightSelect
Feature/access right select
|
2022-01-28 13:00:47 +03:00 |
|
Yaroslavna Gaivoronyuk
|
fdec7246ec
|
Merge branch 'feature/accessRightSelect' of github.com:ONLYOFFICE/AppServer into feature/accessRightSelect
|
2022-01-27 17:29:56 +03:00 |
|
Yaroslavna Gaivoronyuk
|
e068a183d1
|
update README.md
|
2022-01-27 17:29:39 +03:00 |
|
|
0c2085a168
|
Merge branch 'develop' into feature/accessRightSelect
|
2022-01-27 16:52:54 +03:00 |
|
Yaroslavna Gaivoronyuk
|
73c6bcb4f8
|
upd
|
2022-01-27 16:45:02 +03:00 |
|