|
426a11d080
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-12 19:33:41 +03:00 |
|
|
ffde2bf1c2
|
s3: fixed presigned url
|
2022-12-09 23:46:08 +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 |
|
|
153c68b3bd
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-09 13:05:08 +03:00 |
|
|
8d1393ba8e
|
Core: changed singleton to scope
|
2022-12-09 12:23:26 +03:00 |
|
|
966364da9e
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-09 12:14:48 +03:00 |
|
|
4fa41aa273
|
fixed updating ownerId
|
2022-12-08 18:50:50 +03:00 |
|
|
cd0de88e6c
|
Core.Common: fix getting user groups
|
2022-12-08 14:55:05 +03:00 |
|
|
4affc5f58f
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-07 18:50:14 +03:00 |
|
|
a03b50bd7c
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-07 16:20:29 +03:00 |
|
|
ea1f2ba1b7
|
Merge branch 'develop' into feature/socket-newtag
|
2022-12-07 16:16:59 +03:00 |
|
|
61f7765a4f
|
Merge branch 'develop' into feature/api-origin
|
2022-12-06 21:47:56 +03:00 |
|
|
7d0cc5a396
|
Merge pull request #1099 from ONLYOFFICE/bugfix/room-admin-permissions
Bugfix/room admin permissions
|
2022-12-06 15:22:47 +03:00 |
|
|
346c8d08e3
|
Core.Common: changed permissions validation logic
|
2022-12-06 01:57:45 +03:00 |
|
|
1596b4392b
|
Core.Common: added rules matching support
|
2022-12-06 01:55:33 +03:00 |
|
|
3ee45f256b
|
Core.Common: added new secuirty objects
|
2022-12-06 01:55:13 +03:00 |
|
|
6202e65932
|
Core.Common: added default rules
|
2022-12-06 01:54:35 +03:00 |
|
|
cd23ed5efc
|
Core.Common: added rule
|
2022-12-06 01:54:18 +03:00 |
|
|
5e026445f5
|
Core.Common: added check for default rules
|
2022-12-06 01:49:57 +03:00 |
|
|
52f77ac06b
|
Common: added interface IRuleData
|
2022-12-06 01:48:02 +03:00 |
|
|
28e2392e55
|
Core.Common: added clearing cache with user id
|
2022-12-05 14:06:42 +03:00 |
|
|
094e8d41ff
|
Merge branch 'develop' into feature/room-admin-permissions
|
2022-12-05 11:15:15 +03:00 |
|
|
997b2547b5
|
remove waste
|
2022-12-02 11:01:00 +03:00 |
|
|
5e253bb9c8
|
set region when start app
|
2022-11-30 19:03:44 +03:00 |
|
|
fbfd9daa46
|
Merge branch 'develop' into feature/socket-newtag
|
2022-11-30 18:37:34 +03:00 |
|
|
a44d24d86f
|
Merge branch 'develop' into feature/migration_personal
|
2022-11-30 16:24:04 +03:00 |
|
|
3a927973e3
|
Merge pull request #1018 from ONLYOFFICE/feature/users-payments-filter
Feature/users payments filter
|
2022-11-29 23:31:37 +04:00 |
|
|
bacde66b72
|
Merge branch 'develop' into feature/users-payments-filter
|
2022-11-29 22:24:50 +03:00 |
|
|
baedfcc93a
|
fixed performance issue
|
2022-11-29 16:47:26 +03:00 |
|
|
b9f45035b9
|
Merge branch 'release/rc-v1.2.0' into feature/migration_personal
# Conflicts:
# common/ASC.Data.Backup.Core/Contracts/IBackupService.cs
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
|
2022-11-29 13:07:12 +03:00 |
|
|
610e0b3064
|
Core.Common: added method to get user type
|
2022-11-29 11:52:29 +03:00 |
|
|
014c07c06a
|
Core.Common: added option to disable validation
|
2022-11-29 11:51:54 +03:00 |
|
|
130532927b
|
Merge branch 'develop' into feature/socket-newtag
|
2022-11-24 17:56:32 +03:00 |
|
|
8d421a3b24
|
refactoring
|
2022-11-24 17:21:34 +03:00 |
|
|
ee04a7a55c
|
removed unused dependencies
|
2022-11-24 14:40:13 +03:00 |
|
|
0d65c0dccf
|
revert
|
2022-11-23 18:54:59 +03:00 |
|
|
284c329f70
|
Core: autodetect mysql version
|
2022-11-23 18:45:33 +03:00 |
|
|
2b9446dc26
|
fix startup
|
2022-11-23 12:17:08 +03:00 |
|
|
d1c0e79eee
|
Get tenantDomain from origin
|
2022-11-18 17:17:50 +03:00 |
|
|
e5863dddcc
|
fix
|
2022-11-15 17:07:51 +03:00 |
|
|
61b401d906
|
fix
|
2022-11-15 13:28:25 +03:00 |
|
|
629f44b2f2
|
Core: added sorting users by type
|
2022-11-14 12:17:33 +03:00 |
|
|
4432bf7d22
|
Socket: async, refactoring
Files: markasnew
|
2022-11-13 20:33:19 +03:00 |
|
|
d7c1787442
|
dbContext from regions
|
2022-11-13 00:44:57 +03:00 |
|
|
aa0222f078
|
Merge branch 'develop' into feature/migration_personal
|
2022-11-11 15:05:26 +03:00 |
|
|
7e633c8e70
|
Core: added payments filter
|
2022-11-10 17:13:33 +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 |
|
|
c3c19aba39
|
fix migration
|
2022-11-07 13:43:49 +03:00 |
|
|
ca85ef1d49
|
fix usings
|
2022-11-07 12:34:50 +03:00 |
|