Commit Graph

5 Commits

Author SHA1 Message Date
fa3a115c5c Finalized the merge..
Merge remote-tracking branch 'origin/CreateStaticFileHost' into UnbrokenSQLiteImplementation

# Conflicts:
#	DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/App.config
#	DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Service1.cs
#	DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/WindowsDataCenter.csproj
#	DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/packages.config
#	DataCenter_Windows/WindowsDataCenter/WindowsDataServiceHost/App.config
#	DataCenter_Windows/WindowsDataCenter/WindowsDataServiceHost/packages.config
2017-02-01 20:28:42 +00:00
f96078f2ca add the missing file references from adding DalSoft and Owin Static Files...
stupid visual studio, stupid operator.
2017-02-01 19:54:19 +00:00
ff20c6abdf added static files owin host and dalsoft webapi help pages package manually to merge in branch. (preventing app from running after merge otherwise, no idea why) 2017-02-01 19:46:17 +00:00
532ed16bbd Added package DalSoft.WebApi.HelpPage which will create help pages for every ApiController in the solution. 2017-01-29 16:09:26 +00:00
e5ce621827 Initial commit of Windows Service DataCenter variant (pulling code from the RPi variant). 2017-01-26 16:45:04 +00:00