Commit Graph

1076 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
e5393096a7
Merge pull request #972 from ONLYOFFICE/bugfix/rooms
Bugfix/rooms
2022-11-02 19:05:17 +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
d450457703 removed unnecessary call when inviting a user that reduces performance 2022-11-01 14:06:31 +03:00
78bd9f0e13 Merge branch 'develop' into feature/invite-accounts 2022-10-27 19:18:07 +03:00
fa9dd5bd94 rename singnalR to socket 2022-10-27 15:37:26 +03:00
d54a2fc79e rename file 2022-10-27 15:33:06 +03:00
ef7215fbe3 fix 2022-10-27 14:06:37 +03:00
deb0c5beb7 remove .wait and .result 2022-10-27 13:49:42 +03:00
37e52ea733 Core.Common: fix for invated users 2022-10-25 23:16:54 +03:00
22d800afcd Core.Common: added new type 2022-10-25 23:15:57 +03:00
972d66e4ea Core.Common: fix invalidate cache 2022-10-25 23:15:35 +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
42b4787899 refactoring saveUserInfo 2022-10-24 18:30:17 +03:00
ac05302b21 Merge branch 'develop' into feature/rights-rework 2022-10-21 13:14:00 +03:00
60f2393940 Quota: fix 2022-10-20 14:53:38 +03:00
f01376cc56 Merge branch 'develop' into feature/remove-waste 2022-10-20 11:24:20 +03:00
35592fd306 Quota: fix 2022-10-19 19:27:04 +03:00
ea86b81c7e Quota: fix 2022-10-19 18:04:31 +03:00
0a955950e6 fix 2022-10-19 17:11:52 +03:00
2b95553037 another fix quota 2022-10-19 16:22:13 +03:00
22a24de659 Merge branch 'develop' into feature/rights-rework 2022-10-19 15:31:14 +03:00
0ad23f779c fix quota 2022-10-19 14:53:56 +03:00
afc9d1ce17 Merge branch 'develop' into feature/remove-waste 2022-10-19 14:18:52 +03:00