|
40a5fb35df
|
fixed audit/login/last
|
2022-07-19 14:59:36 +03:00 |
|
|
a2037eb91d
|
fix build
|
2022-07-18 18:30:08 +03:00 |
|
|
3bde5f83c9
|
removed ASC.Thumbnails.Svc
fix ASC.Data.Storage.Encryption
fixed ASC.Projects
|
2022-07-18 14:25:25 +03:00 |
|
|
ccbac1d3fa
|
consolidated packages
|
2022-07-18 13:50:05 +03:00 |
|
|
d94904b6af
|
removed voip
|
2022-07-18 12:24:12 +03:00 |
|
|
e2b1e48fa9
|
removed voip service
|
2022-07-15 18:46:52 +03:00 |
|
|
d8980cc3a7
|
fix 57917
|
2022-07-14 20:00:43 +03:00 |
|
|
2aec92c2e0
|
fix
|
2022-07-13 18:15:29 +03:00 |
|
|
595cfcc2d2
|
fixed loginevent
|
2022-07-13 15:15:13 +03:00 |
|
|
ed7ef58b53
|
Api: fixed loginevent
|
2022-07-13 14:21:25 +03:00 |
|
|
04603f1314
|
Merge branch 'develop' into bugfix/Bug53348
|
2022-07-13 13:42:24 +03:00 |
|
|
c1be6ecb61
|
Settings: ignore id
|
2022-07-12 15:33:46 +03:00 |
|
|
c9f7e95d5c
|
fixed iprestrictions method
|
2022-07-12 12:06:38 +03:00 |
|
|
fd986320f2
|
Api: fixed maildomainsettings
|
2022-07-12 11:47:05 +03:00 |
|
|
70a8100235
|
Bug 53348 - Client.Account termination. Account deletion confirmation page when following an invalid link.
|
2022-07-11 15:58:13 +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 |
|
|
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 |
|
|
468d0d569e
|
EmployeeDtoHelper: user cache
|
2022-07-05 12:55:19 +03:00 |
|
|
191e66a238
|
Notify: fix warning
|
2022-07-04 16:55:11 +03:00 |
|
|
02653c3568
|
fix payment
|
2022-07-04 14:54:24 +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 |
|
|
5d4715e674
|
fix
|
2022-07-01 17:37:09 +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 |
|
|
7e34e45371
|
ElasticSearch: disabled by default
|
2022-07-01 12:53:18 +03:00 |
|
|
45cd9434f4
|
fix Bug 57888
|
2022-06-30 19:41:17 +03:00 |
|
|
f24fc8e19e
|
fix
|
2022-06-30 17:12:49 +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 |
|
|
630250b439
|
fix tests
|
2022-06-30 12:07:30 +03:00 |
|
|
75be0827d7
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
# Conflicts:
# products/ASC.Files/Service/GlobalUsings.cs
|
2022-06-29 20:01:27 +03:00 |
|
|
35ab5a3531
|
fix order
|
2022-06-29 19:43:29 +03:00 |
|
|
d78509993f
|
fixed Bug 53280
|
2022-06-29 18:40:35 +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 |
|
|
e483177f24
|
fixed: Bug 57693
|
2022-06-28 19:42:13 +03:00 |
|
|
fa815c6254
|
fix order endpoints
|
2022-06-28 15:53:06 +03:00 |
|
|
f9f73f733f
|
fixed log path
|
2022-06-28 15:50:13 +03:00 |
|
|
83bb63ff0c
|
remove waste
|
2022-06-28 15:33:22 +03:00 |
|
|
d1063df40c
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
|
2022-06-28 15:32:06 +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 |
|
|
dd52a695e5
|
fix build
|
2022-06-27 23:18:23 +03:00 |
|
|
6d98440200
|
az resources
|
2022-06-27 14:00:23 +03:00 |
|
|
4ad4c34b34
|
fix
|
2022-06-24 16:23:56 +03:00 |
|
|
fef096b0a5
|
fix generating thumbnails for video
|
2022-06-24 16:22:52 +03:00 |
|
|
c9eaeed719
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
# Conflicts:
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
|
2022-06-23 12:09:13 +03:00 |
|
|
5bcbae5711
|
fix
|
2022-06-23 11:48:31 +03:00 |
|
|
f2da6fc55c
|
Merge pull request #693 from ONLYOFFICE/feature/docspace
Feature/docspace
|
2022-06-22 11:55:36 +04:00 |
|