|
a886b1b802
|
Merge pull request #1019 from ONLYOFFICE/feature/subject-filter
Feature/rooms subject filter
|
2022-11-29 22:58:11 +04:00 |
|
|
083eaeac4c
|
Files: updated filter by subject for rooms
|
2022-11-28 11:37:34 +03:00 |
|
|
cc77986859
|
Files: folders renamed
|
2022-11-25 18:07:47 +03: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 |
|
|
2b9446dc26
|
fix startup
|
2022-11-23 12:17:08 +03:00 |
|
|
7132f3e351
|
fix
|
2022-11-21 16:35:20 +03:00 |
|
|
9a03f19b62
|
add semaphore
|
2022-11-19 05:40:13 +03:00 |
|
|
e940da5480
|
fix fileOperation
|
2022-11-19 05:40:00 +03:00 |
|
|
d509f1e31b
|
fix FileMoveCopyOperation
|
2022-11-16 14:36:30 +03:00 |
|
|
ca5e0e4d1e
|
fix
|
2022-11-16 11:18:24 +03:00 |
|
|
7d9d8fcba3
|
Files: tag dao. Async
|
2022-11-15 19:10:39 +03:00 |
|
|
e5863dddcc
|
fix
|
2022-11-15 17:07:51 +03:00 |
|
|
e17ef78c00
|
fix
|
2022-11-15 14:22:53 +03:00 |
|
|
a3832db2f6
|
Files: added filtering by member for administrator
|
2022-11-10 15:15:50 +03:00 |
|
|
789ab8f956
|
Merge branch 'develop' into feature/refactoring-saveUserInfo
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Service/Core/FilesModule.cs
# products/ASC.Files/Service/Core/FoldersModule.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Core/QuotaSync.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
|
2022-11-09 12:57:16 +03:00 |
|
|
a9fc7a14ed
|
Removed old code
|
2022-11-08 13:57:51 +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 |
|
|
6d61e2013e
|
Files: fix rooms constraints
|
2022-11-03 16:07:41 +03:00 |
|
|
e5393096a7
|
Merge pull request #972 from ONLYOFFICE/bugfix/rooms
Bugfix/rooms
|
2022-11-02 19:05:17 +03:00 |
|
|
07937d9beb
|
fix
|
2022-11-02 14:07:27 +03:00 |
|
|
7d1717ac3e
|
fix
|
2022-11-02 14:06:05 +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 |
|
|
141bed97b4
|
Merge branch 'develop' into feature/refactoring-saveUserInfo
|
2022-11-02 11:16:29 +03:00 |
|
|
434a34c021
|
Merge branch 'develop' into bugfix/rooms
|
2022-11-02 10:48:26 +03:00 |
|
|
606e851a34
|
FileOperation inherited DistributedTaskProgress
|
2022-11-01 18:44:05 +03:00 |
|
|
052249b4ef
|
Files: fixed when room access was 0
|
2022-10-31 13:13:35 +03:00 |
|
|
7a01578f0c
|
Merge pull request #939 from ONLYOFFICE/feature/remove-new-TenantQuotaController
remove "new TenantQuotaController"
|
2022-10-31 13:03:28 +03:00 |
|
|
0f72136ff0
|
Merge branch 'develop' into bugfix/rooms
|
2022-10-31 11:34:50 +03:00 |
|
|
e197a7b506
|
Quota: fix
|
2022-10-28 17:35:22 +03:00 |
|
|
ef10f570f5
|
Files: fixed incorrect setting user type
|
2022-10-28 16:24:58 +03:00 |
|
|
7978fcbdfd
|
Files: added correct parent folder id for thirdparty room
|
2022-10-28 15:44:23 +03:00 |
|
|
8835bc9bac
|
Files: added correct path for thirdparty rooms
|
2022-10-28 15:43:17 +03:00 |
|
|
0baa36c1c0
|
GetDataStore tenant string to int
|
2022-10-28 15:23:51 +03:00 |
|
|
78bd9f0e13
|
Merge branch 'develop' into feature/invite-accounts
|
2022-10-27 19:18:07 +03:00 |
|
|
aac059274e
|
Quota: fix
|
2022-10-27 17:44:20 +03:00 |
|
|
dbaf6bb264
|
remove unused resources
|
2022-10-27 16:15:08 +03:00 |
|
|
95a1743258
|
Revert "remove unused resources"
This reverts commit 2d99753676 .
|
2022-10-27 16:01:32 +03:00 |
|
|
fa9dd5bd94
|
rename singnalR to socket
|
2022-10-27 15:37:26 +03:00 |
|
|
deb0c5beb7
|
remove .wait and .result
|
2022-10-27 13:49:42 +03:00 |
|
|
eb485d035a
|
Api.Core: added employee type
|
2022-10-26 17:38:47 +03:00 |
|
|
fe5385053c
|
rebbitmq: split default queue on separate queue
|
2022-10-26 17:21:37 +03:00 |
|
|
92ef73eb86
|
async UpdateUserInfo and SaveUserInfo
|
2022-10-25 18:27:56 +03:00 |
|
|
128527a809
|
Merge branch 'develop' into feature/recalculate-user-quota
|
2022-10-25 17:33:56 +03:00 |
|
|
4ad83e7258
|
Quota: quota recalculation check function
|
2022-10-25 17:31:25 +03:00 |
|
|
aa29906ab8
|
Files: fix
|
2022-10-25 16:37:52 +03:00 |
|