Commit Graph

917 Commits

Author SHA1 Message Date
2d1a5f1fb2 Web.Api: changed permissions validation logic 2022-12-06 01:58:03 +03:00
a378763860 Web.Api: changed validation 2022-11-29 12:00:17 +03:00
e39f42288a AllowNotPayment for colortheme method 2022-11-25 20:41:47 +03:00
db7dffe624 refactoring 2022-11-24 17:22:34 +03:00
8d421a3b24 refactoring 2022-11-24 17:21:34 +03:00
Vlada Gazizova
5884fa7acd
Merge branch 'develop' into feature/custom-theme 2022-11-21 11:15:55 +03:00
b227a68b5f CustomColorThemesSetting: fix 2022-11-18 19:39:10 +03:00
f8901ce291 Wizard: fix complete 2022-11-18 11:59:30 +03:00
999e892b7e Merge branch 'develop' into feature/custom-theme 2022-11-17 17:30:46 +03:00
d39666df9d fix 2022-11-16 18:27:07 +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
6747d4d763 Api: allownotpayment, owner check for suspend and delete methods 2022-11-16 17:40:00 +03:00
fed6d30095 Api: added TenantDto 2022-11-14 17:17:57 +03:00
75ca934448 Merge branch 'develop' into feature/custom-theme 2022-11-11 22:22:40 +03:00
29ebaa020c Api: CustomColorThemesSettingsItem. Added name, added new theme 2022-11-11 16:05:21 +03:00
38e93b30bc CustomColorThemesSettings: added new settings 2022-11-11 12:22:41 +03:00
d7949c9b65 CustomColorThemesSettings: added new settings 2022-11-11 12:18:57 +03:00
2314dce176 fix apisystem 2022-11-10 18:07:11 +03:00
b999f6dbc5 fix PasswordChange 2022-11-09 20:26:59 +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
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
141bed97b4 Merge branch 'develop' into feature/refactoring-saveUserInfo 2022-11-02 11:16:29 +03:00
342343a1e1
Merge pull request #925 from ONLYOFFICE/feature/rights-rework
Feature/rights rework
2022-10-27 19:59:03 +04:00
ef7215fbe3 fix 2022-10-27 14:06:37 +03:00
f4ecdf9fa3 Merge branch 'develop' into feature/refactoring-saveUserInfo 2022-10-27 13:55:30 +03:00
deb0c5beb7 remove .wait and .result 2022-10-27 13:49:42 +03:00
29ee2b04b2 Api: whitelabel/logos AllowAnonymous 2022-10-27 11:53:44 +03:00
92ef73eb86 async UpdateUserInfo and SaveUserInfo 2022-10-25 18:27:56 +03:00
277ca1c2cb fixed field number generator 2022-10-25 16:08:23 +03:00
5e8d06846e Api: fix activeconnections. 2022-10-25 14:19:53 +03:00
42b4787899 refactoring saveUserInfo 2022-10-24 18:30:17 +03:00
e39248457e fix /api/2.0/portal/continue.json 2022-10-24 14:34:37 +03:00
ac05302b21 Merge branch 'develop' into feature/rights-rework 2022-10-21 13:14:00 +03:00
f01376cc56 Merge branch 'develop' into feature/remove-waste 2022-10-20 11:24:20 +03:00
22a24de659 Merge branch 'develop' into feature/rights-rework 2022-10-19 15:31:14 +03:00
7569a741d8 Merge branch 'develop' into feature/company-info-settings 2022-10-19 15:21:18 +03:00
afc9d1ce17 Merge branch 'develop' into feature/remove-waste 2022-10-19 14:18:52 +03:00
16bb42d0af fix ASC.Data.Storage.Encryption 2022-10-19 13:12:33 +03:00
b9968f8b5a Whitelabel: fix payment 2022-10-19 11:38:12 +03:00
9df8c0d69f Quota: fix 2022-10-18 21:37:16 +03:00
1a5c273825 refactor 2022-10-18 14:43:31 +03:00
7af080486c Merge branch 'develop' into feature/rights-rework 2022-10-18 14:32:17 +03:00
a2d144514d refactor 2022-10-18 14:22:02 +03:00
3550e0fef6 add greetingsettings/isdefault 2022-10-18 12:06:08 +03:00
a5165d09cf Merge branch 'develop' into feature/company-info-settings 2022-10-18 10:31:15 +03:00
19ad5b0ef2 fix api system 2022-10-17 12:15:44 +03:00
16af78a2a2 fix is default 2022-10-14 23:59:18 +03:00
e2ccab3c97 ApiSystem: fix 2022-10-14 17:52:00 +03:00