Wenkai Yin 78366ad23a Merge remote-tracking branch 'upstream/master' into 170620_pm ... Conflicts: src/ui/service/notification.go		2017-06-20 13:26:14 +08:00
..
adminserver	add with_clair flag in systeminfo	2017-06-15 16:15:46 +08:00
common	use project manager instead of dao method	2017-06-20 13:19:43 +08:00
jobservice	State machine recover from panic and set job state to error	2017-06-16 19:08:59 +08:00
ui	Merge remote-tracking branch 'upstream/master' into 170620_pm	2017-06-20 13:26:14 +08:00
ui_ng	Fix project role displaying issue	2017-06-15 18:17:00 +08:00
vendor	handlers for image scan, store results overview in DB	2017-06-13 23:37:54 +08:00
favicon.ico	change code 20161019	2016-10-21 18:39:10 +08:00