20 Commits (1471e0a24720e3d993bd35d7e5b7fde65658a427)

Author	SHA1	Message	Date
halcyon	a04bb100bf	Merge branch 'cmdb' into dev	2015-11-19 22:01:38 +08:00
halcyon	d42197db3a	fix tower bugs	2015-11-17 23:34:13 +08:00
ibuler	8479989ea8	更换nav ico, 修复需要登陆，登陆后跳转到登陆前页面	2015-11-17 21:41:03 +08:00
ibuler	3b07198b8a	merge with cmdb	2015-11-15 19:57:25 +08:00
yumaojun	012950cb68	merge update...	2015-11-14 23:07:08 +08:00
yumaojun	f6bc03324f	1. rule operations list add delete edit info page compeleted ... 2. rule operations list add delete edit info page compeleted	2015-11-14 21:13:02 +08:00
yumaojun	6d5d279f61	1. 增加授权规则的添加，删除，编辑，详情页面。 ... 2. 修改nav.html中关于授权部分页面。 3. 修改Jasset APP 下的 view，使得数据库中存储的密码是明文。	2015-11-14 10:16:48 +08:00
halcyon	b7c3cc5532	add idc	2015-11-13 00:03:51 +08:00
wangyong	0c0f05b6d9	jasset base	2015-11-03 17:07:46 +08:00
ibuler@qq.com	0e24ebdb26	merge with dev	2015-10-29 11:11:05 +08:00
liuzheng712	ac5ac5e06b	change role finished , but need more think	2015-10-28 21:03:54 +08:00
liuzheng712	8e9f22537f	reuse asset_list for host_list	2015-10-27 17:40:53 +08:00
ibuler@qq.com	72a18d6abf	use map	2015-10-24 23:52:06 +08:00
ibuler@qq.com	50d2bfb272	someday	2015-10-12 09:58:38 +08:00
Administrator	43fe985143	添加组授权	2015-10-06 18:51:49 +08:00
guanghongwei	9f7b066ca6	shouquanxiugai	2015-10-04 21:50:29 +08:00
ibuler	907c2c7e97	资产修改基本完成	2015-09-10 22:51:42 +08:00
ibuler	8bf9103fcf	修改资产管理	2015-09-09 00:19:17 +08:00
ibuler	33c624c76f	删除部门后	2015-08-27 00:08:20 +08:00
ibuler	412dadce76	version 2.0.0 beta	2015-04-20 10:12:11 +08:00