Vladimir Khvan
d9418d7fef
Merge branch 'develop' into feature/webhooks-page
2023-04-25 12:26:46 +05:00
NikitaVashchuk
a6bb9aac83
WhitelabelController: GetWhiteLabelLogos: removed notification field from response
2023-04-19 13:03:01 +05:00
Vladimir Khvan
64f5f60de2
Merge branch 'develop' into feature/webhooks-page
2023-04-18 15:20:43 +05:00
Vladimir Khvan
a1e5e3b7ed
Merge branch 'develop' into feature/webhooks-page
2023-04-16 15:24:17 +05:00
NikitaVashchuk
26c566e7d2
fix CreateWebhook, added query parameters for UpdateWebhook
2023-04-14 21:31:36 +05:00
41483c51be
add base-domain in api method "settings"
2023-04-14 10:49:00 +03:00
NikitaVashchuk
61533655d5
added log filter by eventId
2023-04-12 16:35:15 +05:00
ed96fe2bdb
refresh quota
2023-04-11 18:58:44 +03:00
2a736e7c64
Settings: legalterms
2023-04-10 19:10:30 +03:00
64c44bed2a
Merge branch 'release/v1.0.0' into feature/quota-via-websocket
2023-04-07 16:14:11 +04:00
7b1101b50c
add "documentation-email" in config
2023-04-07 14:18:22 +03:00
NikitaVashchuk
3fc877a422
GetJournal(HttpGet("webhooks/log"): added group status for webhooks as bit flag; added deliveryFrom, deliveryTo; added search by configId;
...
GetTenantWebhooks(HttpGet("webhook")): added status for last webhook;
UpdateWebhook([HttpPut("webhook")]): added ssl option;
Updated db migrations
2023-04-06 23:46:23 +05:00
8d6e51a16f
fix
2023-04-05 12:54:02 +03:00
e35e8f1369
Merge branch 'release/v1.0.0' into feature/quota-via-websocket
2023-04-05 11:20:45 +04:00
32f5d3dc2f
fix
2023-04-04 14:35:22 +03:00
3e2de4cb75
add ZendeskKey and BookTrainingEmail in SettingsDto
2023-04-04 13:20:59 +03:00
Vashchuk Nikita
0db7c335bf
socket notification when archiving a room,
...
changed file_size id to total_size when added/deleted files,
fix notification when adding paid users,
fix notification when block/unblock users,
fix problem with change-quota-feature-value notification when updating quota
2023-04-03 16:31:14 +05:00
5aacc82904
fixed room history
2023-03-30 18:36:22 +03:00
Vashchuk Nikita
604b67fa58
functionality for notification ASC.Socket.IO about quota changes
2023-03-30 19:13:13 +05:00
04f6fe5db4
api method "whitelabel/logos" AllowSuspended
2023-03-30 13:49:52 +03:00
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
Vashchuk Nikita
e6005f5ab7
added name attribute, modified migrations
2023-03-14 21:27:12 +05: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
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
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