17 Commits (742e56fc5f48169d4aa4cd22d76c402962479d2e)

Author	SHA1	Message	Date
wangyong	49821062fb	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	2015-11-24 11:22:01 +08:00
wangyong	99439be04f	add update all button	2015-11-24 11:20:01 +08:00
ibuler	a7a030fedd	fix bug	2015-11-23 23:07:58 +08:00
ibuler	4c50551249	fix some bug	2015-11-23 19:15:52 +08:00
ibuler	483ca9677c	资产列表添加连接	2015-11-23 18:39:38 +08:00
wangyong	5a3c11f619	asset update batch and crontab	2015-11-22 23:53:25 +08:00
wangyong	d25e23623a	fix bugs	2015-11-22 18:57:47 +08:00
wangyong	652ea98a2b	alert ip -> hostname	2015-11-21 18:28:25 +08:00
halcyon	b4c13069c0	batch asset alert	2015-11-20 00:03:36 +08:00
halcyon	f9b1d3059a	fix bugs	2015-11-19 21:58:44 +08:00
halcyon	d42197db3a	fix tower bugs	2015-11-17 23:34:13 +08:00
wangyong	0f29745bfa	asset add batch	2015-11-14 23:09:13 +08:00
halcyon	b7c3cc5532	add idc	2015-11-13 00:03:51 +08:00
halcyon	e77ec102d9	just do it	2015-11-08 22:39:30 +08:00
root	159398b391	fix bugs	2015-11-03 23:53:12 +08:00
wangyong	0c0f05b6d9	jasset base	2015-11-03 17:07:46 +08:00
ibuler	8bf9103fcf	修改资产管理	2015-09-09 00:19:17 +08:00