Commit Graph

96 Commits

Author SHA1 Message Date
SuhorukovAnton
3d79f7c484 encryption: fix 2020-09-08 11:26:05 +03:00
SuhorukovAnton
bd3c14c7ec encryption: fix 2020-09-07 18:04:26 +03:00
82dd4a8828 Settings: fix timeZones for unix 2020-09-03 18:30:14 +03:00
maksim
95299daaf9 ASC.Data.Storage.Migration: adding listener and extension 2020-08-27 17:06:03 +03:00
maksim
8282f3f658 fix 2020-08-27 17:01:37 +03:00
13cef58770 Settings: auth. Translate 2020-08-26 19:13:41 +03:00
952e0f40c7 Settings: authservice api 2020-08-26 17:34:21 +03:00
maksim
eecf23f214 ASC.Data.Storage.Migration: bugfix 2020-08-24 09:52:17 +03:00
maksim
280604e41d ASC.Data.Storage.Migration: adding protocol buffers and event listening 2020-08-21 11:05:27 +03:00
f00a964c32 Merge branch 'master' into feature/private
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2020-08-14 17:19:36 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
bcda6bf69f Api: refresh license 2020-08-11 11:52:39 +03:00
Ilya Oleshko
0bae66814f Fix: Fixed file upload from form 2020-08-07 17:32:55 +03:00
58a0b5dd7a Settings: remove check password settings 2020-08-04 10:32:40 +03:00
1dd404187b Settings: fix 2020-08-03 18:34:53 +03:00
178bf82c28 Settings: fix 2020-08-03 17:06:37 +03:00
39b984debd Settings: added license/required and license upload 2020-08-03 16:42:59 +03:00
f6d71ad1f6 Wizard: Complete. Timezone 2020-08-03 15:01:02 +03:00
a6b11e84c5 Settings: Added create timezones 2020-08-03 14:22:22 +03:00
72ae1f5e9b Merge branch 'master' into feature/Wizard
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Common/src/api/settings/index.js
2020-07-31 16:49:54 +03:00
c325cb139d Settings: added authproviders and login.ashx 2020-07-28 11:13:49 +03:00
f9dc19526c Added sendjoininvite, sendadmmail 2020-07-24 17:01:20 +03:00
820117cb04 Api: added SaveMailDomainSettings, EnableAdminMessageSettings 2020-07-22 14:03:38 +03:00
Artem Tarasov
07089f2fc7 added api methods 2020-07-08 11:29:44 +03:00
da9423bfdc Wizard: api 2020-07-02 17:11:59 +03:00
a14049e88f Settings: fixed GetSupportedCultures 2020-06-03 18:51:01 +03:00
3a747ef8e4 Merge branch 'master' into feature/system-json
# Conflicts:
#	common/ASC.Api.Core/Core/ApiContext.cs
#	common/ASC.Api.Core/Core/ApiDateTime.cs
#	common/ASC.Api.Core/Model/EmployeeWraper.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.People/Server/Models/GroupWrapperFull.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Models/BuildVersion.cs
2020-05-07 10:28:20 +03:00
9db8b26985 Replaced NewtonsoftJson with System.Text.Json 2020-02-21 16:19:32 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
8c2b39406f Merge branch 'master' into feature/merge 2020-02-03 14:29:41 +03:00
acde301b26 Merge branch 'master' into feature/merge 2020-01-31 10:59:00 +03:00
2722dfd693 moved from hotfix/10.5.2 2020-01-21 15:44:05 +03:00
Daniil Senkiv
8568666e62 Settings: get customschema through schema id 2020-01-21 15:43:52 +03:00
f730ba5945 Settings: added customschemas 2020-01-20 18:29:30 +03:00
8f6252f6e3 Settings: added CustomNamingPeople 2020-01-16 18:01:07 +03:00
dd28738907 Settings: Added SendOwnerChangeInstructions and ChangeOwner 2020-01-15 18:22:43 +03:00
2782d9f64c Merge branch 'master' into feature/ef
# Conflicts:
#	common/ASC.VoipService/Dao/CachedVoipDao.cs
#	common/ASC.VoipService/Dao/VoipDao.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2019-12-23 16:25:33 +03:00
89efaf9d26 Consumers: added config 2019-12-20 14:17:01 +03:00
3dc8c87a94 EF: DbTenantService 2019-12-03 18:20:21 +03:00
2a1120645a Web: Client: added lazy loader to tabs, added ownerId to settings controller 2019-11-15 10:19:37 +03:00
Daniil Senkiv
203e0f9810 Web.Api: SettingsController: fixed handling displayName for getting time zones 2019-11-12 12:18:11 +03:00
b2dc574943 Settings: fixed di 2019-11-12 11:47:49 +03:00
26c8d56219 DI: refactoring. Added EmployeeWraperHelper 2019-11-11 18:42:07 +03:00
9d2862bf9e Renamed all "*factory" classes to "*Extension"
https://github.com/ONLYOFFICE/AppServer/pull/7#pullrequestreview-314756136
2019-11-11 12:03:49 +03:00
50f06898d7 Merge branch 'master' into refactoring/di
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2019-11-10 18:22:02 +03:00
6ac10fac2f ISettings replaced with ISettingsExt 2019-11-08 18:11:30 +03:00
32781a87e2 DI: refactoring. Extract settings helpers 2019-11-08 15:21:51 +03:00
19b1a0a825 Web: Client: fixed paging navigation on accessRights page, deleted OwnerId from settingController 2019-11-08 14:05:06 +03:00
Daniil Senkiv
dc09621f5d Web.Api: added unconditional getting greetingSettings;
Web.Client: moved greetingSettings from setting reducer to auth reducer
2019-11-07 10:06:13 +03:00
db4ef4a17a DI: Log. refactoring. 2019-11-06 18:03:09 +03:00