28 Commits (49fbae4fad1b9a63daa685e098f61ee8ce59780c)

Author	SHA1	Message	Date
halcyon	09dcdfa318	fix some bugs and hehe	2015-11-26 23:42:58 +08:00
halcyon	34031bfd6b	fix bugs	2015-11-23 23:55:19 +08:00
wangyong	5a3c11f619	asset update batch and crontab	2015-11-22 23:53:25 +08:00
wangyong	652ea98a2b	alert ip -> hostname	2015-11-21 18:28:25 +08:00
halcyon	d42197db3a	fix tower bugs	2015-11-17 23:34:13 +08:00
yumaojun	c00e4c24a3	app jperm role and rule bug fixed...	2015-11-16 13:49:39 +08:00
yumaojun	6da97c5403	merge dev ...	2015-11-15 23:30:37 +08:00
ibuler	3b07198b8a	merge with cmdb	2015-11-15 19:57:25 +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
halcyon	46b1aca5f1	model	2015-10-31 09:23:10 +08:00
ibuler@qq.com	0e24ebdb26	merge with dev	2015-10-29 11:11:05 +08:00
wangyong	8909386d0c	models	2015-10-27 20:13:23 +08:00
ibuler@qq.com	afbbad1604	授权管理	2015-10-07 17:16:20 +08:00
ibuler@qq.com	e99b33c51e	修改使用新表结构	2015-10-06 23:47:53 +08:00
Administrator	699046dad5	修改settings	2015-10-05 23:48:03 +08:00
liuzheng712	02218e624a	lots	2015-10-04 19:07:42 +08:00
liuzheng712	5a5928483f	lots	2015-10-04 00:53:01 +08:00
ibuler	8bf9103fcf	修改资产管理	2015-09-09 00:19:17 +08:00
ibuler	33c624c76f	删除部门后	2015-08-27 00:08:20 +08:00
ibuler	c1facb939e	优化connect.py排序	2015-08-22 00:01:54 +08:00
Guang	9f0620f97e	调整User,UserGroup类	2015-08-20 23:42:27 +08:00
ibuler	fc22677f3f	modify some	2015-06-09 23:06:32 +08:00
halcyon	04522c0b80	修改port字段	2015-05-25 10:03:55 +08:00
ibuler	412dadce76	version 2.0.0 beta	2015-04-20 10:12:11 +08:00