|
|
3269d48e15
|
added new table
|
2023-02-21 14:22:34 +03:00 |
|
|
|
25859e5d4e
|
refactoring
|
2023-02-17 15:56:40 +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 |
|
|
|
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 |
|
|
|
dc71761710
|
Settings: TenantDomainValidator
|
2023-01-26 15:31:06 +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 |
|
|
|
9937ecccee
|
fix
|
2023-01-19 18:32:37 +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 |
|
|
|
5c828d4124
|
upload .ico for favicon
|
2022-12-27 13:49:07 +03:00 |
|
|
|
00b32e638a
|
fix Bug 60214
|
2022-12-23 21:00:05 +03:00 |
|
|
|
a1daacb4d0
|
fix
|
2022-12-21 12:38:47 +03:00 |
|
|
|
426a11d080
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-12 19:33:41 +03:00 |
|
|
|
965867e3f5
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-12-12 17:22:03 +03:00 |
|
|
|
143a4d01ec
|
removed unused variables
|
2022-12-09 17:47:46 +03:00 |
|
|
|
6e45bc5aa8
|
removed unused variables
|
2022-12-09 16:34:00 +03:00 |
|
|
|
7e52c309c1
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-09 15:13:43 +03:00 |
|
|
|
e8e75dfa8a
|
Merge pull request #1110 from ONLYOFFICE/fix/tests
Fix/tests
|
2022-12-09 13:16:21 +03:00 |
|
|
|
966364da9e
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-09 12:14:48 +03:00 |
|
|
|
ccfc8d0e47
|
Auth: added confirm data
|
2022-12-08 17:53:39 +03:00 |
|
|
|
0e6d5405d2
|
fix web.api tests
|
2022-12-07 13:38:35 +03:00 |
|
|
|
2d1a5f1fb2
|
Web.Api: changed permissions validation logic
|
2022-12-06 01:58:03 +03:00 |
|
|
|
b693486b46
|
merge from develop
|
2022-12-01 14:52:46 +03:00 |
|
|
|
a378763860
|
Web.Api: changed validation
|
2022-11-29 12:00:17 +03:00 |
|
Viktor Fomin
|
366d92abb2
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-28 12:09:11 +03:00 |
|
|
|
e39f42288a
|
AllowNotPayment for colortheme method
|
2022-11-25 20:41:47 +03:00 |
|
|
|
db7dffe624
|
refactoring
|
2022-11-24 17:22:34 +03:00 |
|
|
|
8d421a3b24
|
refactoring
|
2022-11-24 17:21:34 +03:00 |
|
Viktor Fomin
|
1fb1228dbd
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-24 02:33:13 +05:00 |
|
|
|
c3e32fac2f
|
WhiteLabel: fix async
|
2022-11-23 17:23:46 +03:00 |
|
|
|
4b180094e8
|
Whitelabel: rename
|
2022-11-22 18:03:59 +03:00 |
|
Vlada Gazizova
|
5884fa7acd
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-21 11:15:55 +03:00 |
|
|
|
b227a68b5f
|
CustomColorThemesSetting: fix
|
2022-11-18 19:39:10 +03:00 |
|
|
|
35e22fe8c8
|
Merge branch 'develop' into feature/fix-whitelable
# Conflicts:
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
# web/ASC.Web.Core/LogoUploader.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-11-18 16:48:19 +03:00 |
|
|
|
f8901ce291
|
Wizard: fix complete
|
2022-11-18 11:59:30 +03:00 |
|
|
|
999e892b7e
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-17 17:30:46 +03:00 |
|
|
|
d39666df9d
|
fix
|
2022-11-16 18:27:07 +03:00 |
|
