Commit Graph

7 Commits

Author SHA1 Message Date
6d98440200 az resources 2022-06-27 14:00:23 +03:00
90bb8a139a UserManager: fix for personal 2021-08-06 17:30:51 +03:00
Vashchuk Nikita
82abf11109 Merge branch 'develop' into feature/calendar
# Conflicts:
#	ASC.Web.sln
#	config/autofac.products.json
#	config/nginx/onlyoffice.conf
#	products/ASC.Calendar/Server/ASC.Calendar.csproj
#	products/ASC.Calendar/Server/Controllers/CalendarController.cs
#	products/ASC.Calendar/Server/Program.cs
#	products/ASC.Calendar/Server/Properties/launchSettings.json
#	products/ASC.Calendar/Server/Resources/CalendarAddonResource.Designer.cs
#	products/ASC.Calendar/Server/Resources/CalendarAddonResource.resx
#	products/ASC.Calendar/Server/Startup.cs
2021-05-18 13:24:02 +03:00
75b62bf81b Calendar: translations 2021-04-23 16:01:14 +03:00
6a4fed2d2c Init Calendar Server back-end 2021-04-21 21:47:27 +03:00
NikolayRechkin
6cf326eb73 Calendar: added a models 2020-02-13 12:18:13 +03:00
NikolayRechkin
be5e845438 init Calendar 2020-02-12 10:58:31 +03:00