Commit Graph

27 Commits

Author SHA1 Message Date
13cef58770 Settings: auth. Translate 2020-08-26 19:13:41 +03:00
952e0f40c7 Settings: authservice api 2020-08-26 17:34:21 +03:00
39b984debd Settings: added license/required and license upload 2020-08-03 16:42:59 +03:00
4b6c0a0261 Merge branch 'master' into feature/Wizard 2020-08-02 21:03:56 +03:00
7f095f03d1 Merge branch 'master' into feature/Wizard
# Conflicts:
#	common/ASC.Resource.Manager/Startup.cs
#	config/kafka.json
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx
#	web/ASC.Web.Core/TariffSettings.cs
2020-07-15 15:23:28 +03:00
533935906f Resource: fix 2020-07-15 12:55:31 +03:00
da9423bfdc Wizard: api 2020-07-02 17:11:59 +03:00
b035a6347e Notify: fix 2020-06-29 17:49:15 +03:00
SuhorukovAnton
9655101d2b Backup: add DIHelper's methods and fix startup 2020-05-28 16:28:51 +03:00
965e8df12b Core: Resources 2020-02-11 18:41:40 +03:00
b4ff0c09a7 moved from hotfix/10.5.2 2020-01-23 14:04:42 +03:00
a93d7adda6 moved from hotfix/10.5.2 2020-01-23 11:52:07 +03:00
f5b3f2838b moved from hotfix/10.5.2 2020-01-22 16:59:49 +03:00
f247b4a303 Notify: fixed resources 2019-09-24 19:21:05 +03:00
bdb5b05748 ASC.People: ProfileAction: sending email change instructions 2019-09-13 17:45:22 +03:00
e8b625f7b4 removed unused resources 2019-08-23 14:26:18 +03:00
23d8201b82 NamingPeopleResource: public 2019-08-22 16:09:57 +03:00
ddfbab4c24 Resources: notify 2019-08-15 11:44:27 +03:00
54f2959906 Resources: translation 2019-08-14 14:27:38 +03:00
acebed2520 Resources: translations 2019-08-13 19:01:36 +03:00
a956764e9c Resources: translate 2019-08-13 18:49:59 +03:00
edab2bda33 Translate: Resource 2019-08-13 17:46:30 +03:00
18f3405715 Translate: NamingPeopleResource 2019-08-13 16:46:10 +03:00
d7376418f8 Removed unused resources 2019-08-13 16:05:36 +03:00
3036e1cb90 Added ASC.Studio.Notify service 2019-08-01 11:47:15 +03:00
0ffdc833b8 Api: added some methods 2019-06-17 14:57:07 +03:00
377287570a Added ASC.Feed, ASC.IPSecurity
Added Resources
2019-06-14 19:14:24 +03:00