Wenkai Yin 9e12274309 Merge remote-tracking branch 'upstream/dev' into 170321_url ... Conflicts: src/ui/router.go		2017-03-23 11:19:34 +08:00
..
api	Merge remote-tracking branch 'upstream/dev' into 170321_url	2017-03-23 11:19:34 +08:00
auth	abstract adminserver client into a single package	2017-03-21 01:00:26 +08:00
config	Merge latest updates.	2017-03-21 11:51:12 +08:00
controllers	fix merge issue	2017-03-21 16:29:51 +08:00
service	provide systeminfo API for UI	2017-03-10 18:53:11 +08:00
static	Updates for new UI latest changes.	2017-03-21 14:20:32 +08:00
views	Dev new ui (#1)	2017-03-20 18:51:20 +08:00
main.go	refactor token service	2017-02-26 19:53:13 +08:00
router.go	Merge remote-tracking branch 'upstream/dev' into 170321_url	2017-03-23 11:19:34 +08:00
ui_test.go	update	2017-01-19 17:56:08 +08:00