Initial commit
Create new.
automatic
start
готова автоматика
new
try 2
исправлен баг - не прописывался ip адрес в таблицу виртуальные машины - исследования
Добавлена страница Search
pcap
Доработа страницу поиска
Merge branch 'master' of https://github.com/alexkasp/votchina

Conflicts:
	web/SandBox.Connection/bin/Debug/SandBox.Connection.dll
	web/SandBox.Connection/bin/Debug/SandBox.Connection.pdb
	web/SandBox.Connection/obj/Debug/ResolveAssemblyReference.cache
	web/SandBox.Connection/obj/Debug/SandBox.Connection.dll
	web/SandBox.Connection/obj/Debug/SandBox.Connection.pdb
	web/SandBox.Db/bin/Debug/SandBox.Db.dll
	web/SandBox.Db/bin/Debug/SandBox.Db.pdb
	web/SandBox.Db/obj/Debug/SandBox.Db.dll
	web/SandBox.Db/obj/Debug/SandBox.Db.pdb
	web/SandBox.TestConnection/bin/Debug/SandBox.Connection.dll
	web/SandBox.TestConnection/bin/Debug/SandBox.Connection.pdb
	web/SandBox.TestConnection/bin/Debug/SandBox.Db.dll
	web/SandBox.TestConnection/bin/Debug/SandBox.Db.pdb
	web/SandBox.TestConnection/bin/Debug/SandBox.TestConnection.exe
	web/SandBox.TestConnection/bin/Debug/SandBox.TestConnection.exe.CodeAnalysisLog.xml
	web/SandBox.TestConnection/bin/Debug/SandBox.TestConnection.pdb
	web/SandBox.TestConnection/obj/x86/Debug/GenerateResource.read.1.tlog
	web/SandBox.TestConnection/obj/x86/Debug/GenerateResource.write.1.tlog
	web/SandBox.TestConnection/obj/x86/Debug/ResolveAssemblyReference.cache
	web/SandBox.TestConnection/obj/x86/Debug/SandBox.TestConnection.exe
	web/SandBox.TestConnection/obj/x86/Debug/SandBox.TestConnection.pdb
	web/SandBox.WebUi/SandBox.WebUi.Publish.xml
	web/SandBox.WebUi/bin/SandBox.Connection.dll
	web/SandBox.WebUi/bin/SandBox.Connection.pdb
	web/SandBox.WebUi/bin/SandBox.Db.dll
	web/SandBox.WebUi/bin/SandBox.Db.pdb
	web/SandBox.WebUi/bin/SandBoxWebUi.dll
	web/SandBox.WebUi/bin/SandBoxWebUi.pdb
	web/SandBox.WebUi/obj/Debug/SandBoxWebUi.dll
	web/SandBox.WebUi/obj/Debug/SandBoxWebUi.pdb
	web/SandBoxDE.suo
	web/StopRschByEvent/obj/x86/Debug/GenerateResource.read.1.tlog
	web/StopRschByEvent/obj/x86/Debug/GenerateResource.write.1.tlog
Исправил ошибку в ReportList.aspx.cs
Обновил ReportList.aspx.cs
Обновил иконки
добавил AskPCAPfile
Обновил стиль wrapper_full. Теперь окно не сжимается меньше 1280px.
Обновил страницу с ресурсами.
Удалил лишние иконки.
Merge branch 'master' of https://github.com/alexkasp/votchina

Conflicts:
	web/SandBox.WebUi/Pages/Research/ReportList.aspx.cs