Commit Graph

8 Commits

Author SHA1 Message Date
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
7f436ef3cb add support WindowsService/systemd for IHostBuilder 2021-04-27 19:25:03 +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
NikitaVashchuk
b56fc15f51 fix calendar 2021-04-13 11:40:31 +03:00
NikitaVashchuk
255af1c30a fix 2021-04-07 14:10:23 +03:00
NikolayRechkin
d811c104a9 Calendar: core: Added calendar db entities 2020-02-19 13:26:11 +03:00
NikolayRechkin
be5e845438 init Calendar 2020-02-12 10:58:31 +03:00