Vladimir Khvan
ae6fbde080
Merge branch 'feature/webhooks-page' of github.com:ONLYOFFICE/DocSpace into feature/webhooks-page
2023-03-27 14:12:38 +05:00
Vladimir Khvan
91d1826f63
Merge branch 'develop' into feature/webhooks-page
2023-03-27 14:12:15 +05:00
0abe404476
invitation link: added tariff/quota/permissions check, refactoring
2023-03-23 16:22:01 +03:00
Vashchuk Nikita
6b0a1eb259
fix UpdateWebhook
2023-03-23 15:12:16 +05:00
Vladimir Khvan
7d44a06e14
Merge branch 'develop' into feature/webhooks-page
2023-03-20 17:52:29 +02:00
69165762db
Web.Api: renamed room to context
2023-03-20 10:36:54 +03:00
939efe37d5
Web.Api: added audit context
2023-03-17 14:34:43 +03:00
e223b54a63
Web.Api: fixed getting audit
2023-03-15 11:45:32 +03:00
Vashchuk Nikita
e6005f5ab7
added name attribute, modified migrations
2023-03-14 21:27:12 +05:00
cad10c140b
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0
2023-03-13 19:16:26 +03:00
434ece42ed
Web.Api: added room in dto
2023-03-13 18:53:49 +03:00
9762e4eaca
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
2023-03-13 11:45:30 +03:00
2fee97df3d
Added 'AllowNotPayment'.
2023-03-13 11:43:58 +03:00
03a0ed298e
fix Bug 61558
2023-03-13 10:47:39 +03:00
633c6d122a
Quota: fix title
2023-03-12 18:46:58 +03:00
e84356411d
fix
2023-03-10 18:30:34 +03:00
Vashchuk Nikita
2d92da7c0c
Merge branch 'release/v1.0.0' into feature/notifications
...
# Conflicts:
# web/ASC.Web.Api/GlobalUsings.cs
2023-03-10 17:39:47 +05:00
e5f733c771
fix Bug 61076
2023-03-10 11:39:54 +03:00
4d0ed3d7db
Merge pull request #1284 from ONLYOFFICE/bugfix/61465
...
Bugfix/61465
2023-03-09 15:36:31 +03:00
30dc57380e
fix Bug 60163
2023-03-07 20:53:31 +03:00
29abce027d
Merge branch 'develop' into feature/notifications
...
# Conflicts:
# packages/client/src/pages/Accounts.jsx
# packages/client/src/store/FilesActionsStore.js
# packages/common/constants/index.js
# products/ASC.People/Server/Api/UserController.cs
2023-03-06 15:37:45 +03:00
84d102c1af
fix Bug 61465 - Accounts. Two-factor authentication.
2023-03-04 00:57:15 +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
ead94f371e
Merge branch 'develop' into feature/notifications
2023-02-27 10:29:50 +03:00
03a4dc89dc
Settings: refactoring
2023-02-24 17:19:10 +03:00
216a6480c8
Merge branch 'develop' into feature/notifications
...
# Conflicts:
# packages/common/constants/index.js
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# yarn.lock
2023-02-22 15:50:55 +03:00
3401abb21a
Merge branch 'develop' into feature/colloborator
2023-02-21 17:11:39 +03:00
3269d48e15
added new table
2023-02-21 14:22:34 +03:00
Vashchuk Nikita
efa04ae8ba
added functionality for notifying users about events via AuditEvent,
...
fix notifyEngine,
edited letter format,
added method for getting roomsId and roomsTitle from a file/folder inside the room,
added method for getting sharing info from foldersIds and userGuid
2023-02-21 13:35:01 +05:00
814f697047
Web.Api: refactor
2023-02-20 11:16:17 +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
ca2906ebee
Merge branch 'develop' into feature/notifications
...
# Conflicts:
# packages/client/src/store/FilesStore.js
2023-02-08 12:44:15 +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
b928966550
added settings for configure RoomsNotification, added mute field for files and folders
2023-02-06 16:15:51 +05:00
Vashchuk Nikita
ab7f24a68b
Merge branch 'release/rc-v1.2.0' into feature/notifications
2023-02-02 18:48:48 +05: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
Vashchuk Nikita
f6ca8e3c78
added methods for configuring notifications
2023-01-26 19:12:12 +05: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