|
|
08fb297064
|
People: fixed adding user as activated
|
2023-01-23 12:49:04 +03:00 |
|
|
|
667b10e874
|
Merge pull request #1149 from ONLYOFFICE/feature/dotnet7
Feature/dotnet7
|
2023-01-19 22:00:57 +03:00 |
|
|
|
9937ecccee
|
fix
|
2023-01-19 18:32:37 +03:00 |
|
|
|
8ad635ba25
|
merge from release/rc-v1.2.0. fixed problem and update dll
|
2023-01-19 15:47:09 +03:00 |
|
|
|
3f97d3a470
|
People: added resending all invitations
|
2023-01-19 13:29:45 +03:00 |
|
|
|
bff2128b5f
|
Resources renamed
|
2023-01-18 18:53:09 +03:00 |
|
|
|
6c112da511
|
Core: fixed user status change
|
2022-12-14 14:38:40 +03:00 |
|
|
|
effed62662
|
People: fixed user status change
|
2022-12-13 22:59:52 +03:00 |
|
|
|
426a11d080
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-12 19:33:41 +03:00 |
|
|
|
33de49463a
|
People: fix permissions checking
|
2022-12-08 14:56:05 +03:00 |
|
|
|
837cee5b8f
|
People: changed permissions validation logic
|
2022-12-06 01:57:55 +03:00 |
|
|
|
094e8d41ff
|
Merge branch 'develop' into feature/room-admin-permissions
|
2022-12-05 11:15:15 +03:00 |
|
|
|
b693486b46
|
merge from develop
|
2022-12-01 14:52:46 +03:00 |
|
Viktor Fomin
|
8f97413d1d
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-30 12:33:31 +03:00 |
|
|
|
bacde66b72
|
Merge branch 'develop' into feature/users-payments-filter
|
2022-11-29 22:24:50 +03:00 |
|
|
|
c32e90f9ef
|
People: changed validation
|
2022-11-29 11:59:33 +03:00 |
|
|
|
475deff8b9
|
People: added option to disable validation
|
2022-11-29 11:52:59 +03:00 |
|
Viktor Fomin
|
366d92abb2
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-28 12:09:11 +03:00 |
|
|
|
8d421a3b24
|
refactoring
|
2022-11-24 17:21:34 +03:00 |
|
|
|
c3e32fac2f
|
WhiteLabel: fix async
|
2022-11-23 17:23:46 +03:00 |
|
|
|
60ee6a9d49
|
WhiteLabel: fixed support img types
|
2022-11-23 12:59:47 +03:00 |
|
|
|
2f7fdaf00a
|
Merge pull request #971 from ONLYOFFICE/feature/refactoring-saveUserInfo
Feature/remove .wait and .result
|
2022-11-16 18:24:29 +03:00 |
|
|
|
782b928ef0
|
People: allowNotPayment
|
2022-11-16 18:14:47 +03:00 |
|
|
|
f974bb0655
|
fix
|
2022-11-15 19:30:52 +03:00 |
|
|
|
13eb4fec1b
|
People: added filtering users by paid
|
2022-11-10 17:14:03 +03:00 |
|
|
|
a4fd81b404
|
migrate from .net6 to .net7
|
2022-11-10 13:10:18 +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 |
|
|
|
2ae75ec762
|
fix ide001
|
2022-11-07 12:49:29 +03:00 |
|
|
|
ca85ef1d49
|
fix usings
|
2022-11-07 12:34:50 +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 |
|
|
|
78bd9f0e13
|
Merge branch 'develop' into feature/invite-accounts
|
2022-10-27 19:18:07 +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 |
|
|
|
06f8917b77
|
People: added link logging
|
2022-10-26 18:20:37 +03:00 |
|
|
|
f137df85cc
|
People: added resend docspace invite
|
2022-10-26 18:16:46 +03:00 |
|
|
|
3e1b1bbe6a
|
People: fix links security, refactor
|
2022-10-26 17:40:43 +03:00 |
|
|
|
fffde238d6
|
People: added employee type parameter
|
2022-10-26 17:39:44 +03:00 |
|
|
|
3adb7d5e8e
|
People: added api for inviting users
|
2022-10-25 23:18:07 +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 |
|
|
|
42b4787899
|
refactoring saveUserInfo
|
2022-10-24 18:30:17 +03:00 |
|
|
|
22a24de659
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-19 15:31:14 +03:00 |
|
|
|
ac0e87e581
|
Quota: fix
|
2022-10-19 14:48:48 +03:00 |
|
|
|
9df8c0d69f
|
Quota: fix
|
2022-10-18 21:37:16 +03:00 |
|
|
|
1a5c273825
|
refactor
|
2022-10-18 14:43:31 +03:00 |
|
|
|
a2d144514d
|
refactor
|
2022-10-18 14:22:02 +03:00 |
|
|
|
7280d2d52b
|
Merge branch 'develop' into feature/recalculate-user-quota
|
2022-10-17 14:20:31 +03:00 |
|
|
|
44149d47b7
|
Users: trash, favorites, recent folders
|
2022-10-12 18:53:48 +03:00 |
|
