|
|
30dc57380e
|
fix Bug 60163
|
2023-03-07 20:53:31 +03:00 |
|
|
|
f95c56198e
|
thumbnail: bump ImageSharp from v2.0.0 to 3.0.0, optimization, refactoring
|
2023-03-03 22:49:36 +03:00 |
|
|
|
308802eeb6
|
optional size in api method /people/${profileId}/photo/thumbnails.json
|
2023-03-01 14:46:26 +03:00 |
|
|
|
c932d935fa
|
Merge branch 'develop' into feature/colloborator
|
2023-02-28 13:48:08 +04:00 |
|
|
|
78a2e20edb
|
refactoring
|
2023-02-27 18:38:01 +03:00 |
|
Timofey Boyko
|
8e59451b4a
|
Merge branch 'develop' into feature/colloborator
|
2023-02-27 15:22:21 +03:00 |
|
|
|
03a4dc89dc
|
Settings: refactoring
|
2023-02-24 17:19:10 +03:00 |
|
|
|
068be391cd
|
Web.Core: fixed invite
|
2023-02-21 19:00:12 +03:00 |
|
|
|
3401abb21a
|
Merge branch 'develop' into feature/colloborator
|
2023-02-21 17:11:39 +03:00 |
|
|
|
94062792d5
|
People: added collaborator, refactor
|
2023-02-21 16:35:57 +03:00 |
|
|
|
3269d48e15
|
added new table
|
2023-02-21 14:22:34 +03:00 |
|
|
|
814f697047
|
Web.Api: refactor
|
2023-02-20 11:16:17 +03:00 |
|
|
|
c1e3d9fb95
|
Web.Core: refactor
|
2023-02-20 11:16:03 +03:00 |
|
|
|
53b3a580fd
|
Web: added count of collaborators, refactor
|
2023-02-20 11:11:16 +03:00 |
|
|
|
b0b3e6df71
|
Web: refactor
|
2023-02-17 17:53:41 +03:00 |
|
|
|
13fbd58dc8
|
Web: added collaborator, refactor
|
2023-02-17 17:51:55 +03:00 |
|
|
|
25859e5d4e
|
refactoring
|
2023-02-17 15:56:40 +03:00 |
|
|
|
1133a84671
|
fix header
|
2023-02-15 21:26:28 +03:00 |
|
|
|
4c92d947e8
|
removed unused migrations
|
2023-02-09 14:36:16 +03:00 |
|
|
|
afe82d599d
|
ASC.Webhooks.Service moved to ASC.Web.Studio
|
2023-02-08 20:31:58 +03:00 |
|
|
|
6d363d4abd
|
Webhooks: settings
|
2023-02-08 14:46:33 +03:00 |
|
|
|
e58175f69e
|
WebHooks: added resources, new methods and settings for disable webhook
|
2023-02-08 14:17:06 +03:00 |
|
|
|
d49ee80fd8
|
Merge branch 'develop' into feature/fix-webhooks-second
|
2023-02-08 13:18:59 +03:00 |
|
|
|
f52f32a6af
|
Merge branch 'develop' into feature/asc.apicache
# Conflicts:
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/Tools/ASC.Migration.Creator/Program.cs
# common/Tools/ASC.Migration.Runner/Program.cs
# common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs
# common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs
|
2023-02-07 17:07:20 +03:00 |
|
|
|
c89b8ca427
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
# common/ASC.Data.Backup.Core/Storage/BackupStorageFactory.cs
# common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
|
2023-02-07 14:31:22 +03:00 |
|
Vashchuk Nikita
|
d8b9fada67
|
added functionality for disable SSL verification on WebhookSender requests
|
2023-01-31 00:25:51 +05:00 |
|
Vashchuk Nikita
|
cf37c1704d
|
remove name from returned parameters
|
2023-01-30 21:31:31 +05:00 |
|
|
|
51d88c1e5a
|
api/settings: return Standalone
|
2023-01-30 11:15:57 +03:00 |
|
|
|
40b15cc06e
|
Merge branch 'develop' into feature/asc.apicache
# Conflicts:
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Storage/BackupStorageFactory.cs
# common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
|
2023-01-26 22:31:26 +03:00 |
|
|
|
dc71761710
|
Settings: TenantDomainValidator
|
2023-01-26 15:31:06 +03:00 |
|
|
|
aae6f4bff4
|
healthcheck: update dll
|
2023-01-24 20:48:33 +03:00 |
|
|
|
8a8143950d
|
replace CreateScope() => CreateScopeAsync()
|
2023-01-24 20:33:27 +03:00 |
|
Vashchuk Nikita
|
596a85a318
|
fix GetJournal
|
2023-01-24 13:40:26 +05:00 |
|
Vashchuk Nikita
|
592c672c34
|
added name to returned parameters
|
2023-01-24 12:03:57 +05:00 |
|
Vashchuk Nikita
|
de94226794
|
fix
|
2023-01-23 18:15:46 +05:00 |
|
Vashchuk Nikita
|
1c32151a77
|
Revert "fix create, update methods", added id to returned parameters
|
2023-01-23 16:53:03 +05:00 |
|
|
|
667b10e874
|
Merge pull request #1149 from ONLYOFFICE/feature/dotnet7
Feature/dotnet7
|
2023-01-19 22:00:57 +03:00 |
|
|
|
4ddf7d521c
|
update external dependency
|
2023-01-19 19:05:07 +03:00 |
|
|
|
9937ecccee
|
fix
|
2023-01-19 18:32:37 +03:00 |
|
|
|
fccdbed5a8
|
fix 60659
|
2023-01-19 18:20:50 +03:00 |
|
|
|
8ad635ba25
|
merge from release/rc-v1.2.0. fixed problem and update dll
|
2023-01-19 15:47:09 +03:00 |
|
|
|
bff2128b5f
|
Resources renamed
|
2023-01-18 18:53:09 +03:00 |
|
Vashchuk Nikita
|
bfe7524dde
|
fix create, update methods
|
2023-01-18 11:24:44 +05:00 |
|
|
|
2f29eb444f
|
fix 60163
|
2023-01-13 14:28:44 +03:00 |
|
|
|
92f786c572
|
fix 60163
|
2023-01-12 12:09:01 +03:00 |
|
|
|
a8bcc8e558
|
Payment: fix
|
2023-01-10 20:56:38 +03:00 |
|
|
|
0090561fb6
|
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
|
2023-01-10 14:47:27 +03:00 |
|
|
|
44804e34db
|
fixed cache room logo/user photo
|
2022-12-29 11:31:22 +03:00 |
|
|
|
9f198ef31d
|
fixed user avatar/room logo cache
|
2022-12-27 18:20:05 +03:00 |
|
|
|
5c828d4124
|
upload .ico for favicon
|
2022-12-27 13:49:07 +03:00 |
|
