0abe404476
invitation link: added tariff/quota/permissions check, refactoring
2023-03-23 16:22:01 +03:00
4353f8f432
fix Bug 61186
2023-03-17 12:27:56 +03:00
Vashchuk Nikita
8bbdeffa46
changed action 5002 to 5034, moved RoomRemoveUser to dailyFeed, fix createRoom action, fix RoomUpdateAccessForUser action, fix userName
2023-03-09 16:40:36 +05: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
Vashchuk Nikita
c92be742cb
Fix/modified sendWhatsNew, Added RoomCreateUser, Added RoomRemoveUser
2023-03-03 20:02:48 +05:00
e73df55f3c
Bug 61218
2023-03-01 20:32:44 +03:00
887926f852
fixed ChunkedUploader with external uploader url
2023-02-28 22:32:56 +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
1c3d3bf132
Merge branch 'develop' into feature/fix-webhooks-second
...
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
2023-02-21 14:33:26 +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
5e9f12a797
backend: refactoring
2023-02-20 23:10:49 +03:00
25859e5d4e
refactoring
2023-02-17 15:56:40 +03:00
0476363100
Merge branch 'develop' into feature/entries-trash-origin
2023-02-10 12:45:26 +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
b63bfc4de5
Files: added filter by origin room
2023-02-07 19:18:32 +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
e2e73d7ced
Files: autocleanup
2023-01-26 20:44:53 +03:00
d4cb3327b7
SocketIO: updateFolder, deleteFolder
2023-01-25 14:50:46 +03:00
8a8143950d
replace CreateScope() => CreateScopeAsync()
2023-01-24 20:33:27 +03:00
8ad635ba25
merge from release/rc-v1.2.0. fixed problem and update dll
2023-01-19 15:47:09 +03:00
ee19865cf0
fix 60180
2023-01-13 16:27:21 +03:00
9d258d5801
Bug 60379
2022-12-29 14:29:07 +03:00
1ae54147ce
Files: added warning message, added demotion on invitation
2022-12-26 12:19:37 +03:00
ae952b6d75
Files: fixing field names for referenceData
2022-12-22 15:37:25 +03:00
67c6c7f4fd
refactoring
2022-12-16 17:08:02 +03:00
1403722ffd
Fixed request.
2022-12-16 15:33:27 +03:00
0bd98986de
Files: portalName in referenceData as string
2022-12-16 10:37:36 +03:00
9e1bb8cb16
Files: fixing field names for referenceData
2022-12-15 16:50:08 +03:00
d171269b6c
fix referencedata
2022-12-14 11:10:40 +03:00
c52c6b06ac
get reference data
2022-12-13 14:00:20 +03:00
8dac43b756
Files: removed products/files/httphandlers
2022-12-08 13:24:57 +03:00
61f7765a4f
Merge branch 'develop' into feature/api-origin
2022-12-06 21:47:56 +03:00
b693486b46
merge from develop
2022-12-01 14:52:46 +03:00
a886b1b802
Merge pull request #1019 from ONLYOFFICE/feature/subject-filter
...
Feature/rooms subject filter
2022-11-29 22:58:11 +04:00
49dd8f538e
DocSpace: hide recent and favorites
2022-11-25 17:44:15 +03:00
4a0bb69db9
Merge branch 'develop' into feature/subject-filter
2022-11-25 13:21:40 +03:00
db7dffe624
refactoring
2022-11-24 17:22:34 +03:00
8d421a3b24
refactoring
2022-11-24 17:21:34 +03:00
56e0760f96
Files: fix CORS
2022-11-21 11:07:17 +03:00
7d9d8fcba3
Files: tag dao. Async
2022-11-15 19:10:39 +03:00
a3832db2f6
Files: added filtering by member for administrator
2022-11-10 15:15:50 +03:00
a4fd81b404
migrate from .net6 to .net7
2022-11-10 13:10:18 +03:00
2ae75ec762
fix ide001
2022-11-07 12:49:29 +03:00
ca85ef1d49
fix usings
2022-11-07 12:34:50 +03:00
14a64f4ad0
Merge branch 'develop' into feature/remove-waste
...
# Conflicts:
# common/services/ASC.ApiSystem/GlobalUsings.cs
# common/services/ASC.ApiSystem/Program.cs
# common/services/ASC.ApiSystem/Startup.cs
# products/ASC.CRM/Server/Classes/Global.cs
# products/ASC.Files/Server/ProductEntryPoint.cs
# web/ASC.Web.Core/QuotaSync.cs
2022-11-07 11:25:54 +03:00
34bda20eb0
Merge branch 'develop' into feature/recalculate-user-quota
...
# Conflicts:
# products/ASC.People/Server/Api/UserController.cs
2022-11-02 13:40:53 +03:00
128527a809
Merge branch 'develop' into feature/recalculate-user-quota
2022-10-25 17:33:56 +03:00
ac05302b21
Merge branch 'develop' into feature/rights-rework
2022-10-21 13:14:00 +03:00
