31 Commits (f3ae7f00a0a2c5d7b7b05223f30af59ef64eeb1f)

Author	SHA1	Message	Date
halcyon	78dc6e5154	bugs	2015-03-14 17:54:27 +08:00
halcyon	ce6494ba64	bugs	2015-03-14 13:13:46 +08:00
halcyon	691271c74f	bugs	2015-03-12 18:54:26 +08:00
halcyon	fd490bd685	bugs	2015-03-12 11:03:53 +08:00
halcyon	95bb96ebbf	各种bug修改	2015-03-07 18:37:23 +08:00
halcyon	6c9c560b86	修改各种bug	2015-03-07 17:50:17 +08:00
halcyon	5bf66ca92e	修改各种bug	2015-03-07 17:37:40 +08:00
guanghongwei	67f9aad1b9	Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei ... Conflicts: docs/AddUserAsset.py	2015-03-07 15:33:06 +08:00
guanghongwei	a94c050fd9	完工，睡觉	2015-03-07 00:12:38 +08:00
halcyon	d0600662ba	dashboard and bugs	2015-03-05 18:46:12 +08:00
root	e086a03692	bug	2015-03-04 23:14:07 +08:00
halcyon	bbe5b588c0	修改bug	2015-03-04 18:33:38 +08:00
root	a746cab21c	bug	2015-02-12 23:17:07 +08:00
halcyon	db86daf86d	dashboard等	2015-02-11 17:53:17 +08:00
halcyon	a42d053cbb	新弹窗等	2015-02-10 18:57:43 +08:00
halcyon	c84f124511	bug	2015-02-09 19:02:25 +08:00
halcyon	de58e92df9	添加组修改，组内删除主机并不删除真实机	2015-02-03 22:45:51 +08:00
halcyon	6c70d5bf03	批量添加删除功能实现，修改资产添加修改等	2015-02-01 23:00:23 +08:00
halcyon	a8991bfb14	资产修改功能强化，日志功能添加	2015-01-31 12:55:10 +08:00
halcyon	173f520929	添加idc和主机组合并	2015-01-26 23:32:52 +08:00
halcyon	d1f6ed4a55	增加日志查看功能	2015-01-25 22:20:07 +08:00
halcyon	1a266f0b19	菜单active bug	2015-01-24 13:54:08 +08:00
halcyon	449bde4b03	菜单active	2015-01-24 12:13:49 +08:00
halcyon	f335e35ba4	修改资产更改页面无法提交bug	2015-01-22 23:02:44 +08:00
halcyon	9b194946c3	修改添加组不选没有提示bug	2015-01-21 18:54:31 +08:00
halcyon	7863a6853c	资产管理页面基本完成，尚有部分小bug	2015-01-19 10:09:16 +08:00
halcyon	1925cf4033	增加js判断	2015-01-14 19:19:56 +08:00
halcyon	6b95c7ed6f	资产详情弹窗	2015-01-14 16:39:57 +08:00
halcyon	acf508f074	资产管理页面基本完成.	2015-01-11 19:27:21 +08:00
halcyon	0ed0853489	完善资产添加和查看资产页面	2015-01-07 18:35:09 +08:00
halcyon	7a86ba0b51	资产管理页面开始，增加添加资产页面，修改base页面等	2015-01-05 18:21:34 +08:00