|
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 |
|
|
f95c56198e
|
thumbnail: bump ImageSharp from v2.0.0 to 3.0.0, optimization, refactoring
|
2023-03-03 22:49:36 +03:00 |
|
Vashchuk Nikita
|
c92be742cb
|
Fix/modified sendWhatsNew, Added RoomCreateUser, Added RoomRemoveUser
|
2023-03-03 20:02:48 +05:00 |
|
|
8b500ae37d
|
Merge pull request #1257 from ONLYOFFICE/bugfix/60605
bugfix/60605
|
2023-03-01 17:41:31 +03:00 |
|
|
6c428d9bbb
|
fix Bug 61111
|
2023-03-01 14:53:55 +03:00 |
|
|
308802eeb6
|
optional size in api method /people/${profileId}/photo/thumbnails.json
|
2023-03-01 14:46:26 +03:00 |
|
|
c932d935fa
|
Merge branch 'develop' into feature/colloborator
|
2023-02-28 13:48:08 +04:00 |
|
|
78a2e20edb
|
refactoring
|
2023-02-27 18:38:01 +03:00 |
|
Timofey Boyko
|
8e59451b4a
|
Merge branch 'develop' into feature/colloborator
|
2023-02-27 15:22:21 +03:00 |
|
|
03a4dc89dc
|
Settings: refactoring
|
2023-02-24 17:19:10 +03:00 |
|
|
c8150ac4b0
|
People: fixed user type filter
|
2023-02-22 12:54:43 +03:00 |
|
|
3401abb21a
|
Merge branch 'develop' into feature/colloborator
|
2023-02-21 17:11:39 +03:00 |
|
|
ca5d711c36
|
People: refactor
|
2023-02-21 16:53:48 +03:00 |
|
|
3269d48e15
|
added new table
|
2023-02-21 14:22:34 +03:00 |
|
|
6f34d873ee
|
People: refactor
|
2023-02-20 11:16:44 +03:00 |
|
|
2be40a9c50
|
People: refactor
|
2023-02-17 17:53:30 +03:00 |
|
|
07dc7dab20
|
People: refactor, added collaborator
|
2023-02-17 17:40:25 +03:00 |
|
|
25859e5d4e
|
refactoring
|
2023-02-17 15:56:40 +03:00 |
|
|
e58175f69e
|
WebHooks: added resources, new methods and settings for disable webhook
|
2023-02-08 14:17:06 +03:00 |
|
|
4fbe654ed5
|
People: fixed user type change
|
2023-01-31 12:52:51 +03:00 |
|
|
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 |
|