44 Commits

Author	SHA1	Message	Date
yumaojun	757f7beeaf	update merge conflict.	2015-11-19 13:20:27 +08:00
yumaojun	2ccd072416	1. delete role filed : is_screty_key ... 2. rule edit page add selected mark 3. role add page consider user use_default_auth attribute 4. role password use jumpserver api CRYPTO to crypt 5. fixed ansible api auto load local host file (/etc/ansible/hosts) bug 6. ansible api command and task interface add pattern default argument( pattern='*')	2015-11-18 17:16:29 +08:00
ibuler	8017b1b479	解决jperm key dir 和 ansible api问题	2015-11-17 23:32:24 +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
yumaojun	0862ffef98	merge map	2015-11-15 08:39:43 +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
ibuler	20970db404	修复环境变量大小写，修改terminal类	2015-11-13 21:15:41 +08:00
ibuler	91b5d039cc	修改邮件settings	2015-11-09 16:28:10 +08:00
ibuler	24730ebd0f	web terminal记录日志	2015-11-07 13:38:50 +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
root	7d412e4c18	update configure file	2015-10-28 22:30:34 +08:00
wangyong	8909386d0c	models	2015-10-27 20:13:23 +08:00
广宏伟	9366003f7b	jlog	2015-10-26 22:17:16 +08:00
ibuler@qq.com	50d2bfb272	someday	2015-10-12 09:58:38 +08:00
liuzheng712	02218e624a	lots	2015-10-04 19:07:42 +08:00
liuzheng712	5a5928483f	lots	2015-10-04 00:53:01 +08:00
liuzheng712	79c79432f5	usermodle	2015-09-15 23:38:06 +08:00
ibuler	8bf9103fcf	修改资产管理	2015-09-09 00:19:17 +08:00
ibuler	913f93b91f	删除部门前	2015-08-26 23:31:32 +08:00
ibuler	e2ac212fc3	resolve confilict	2015-04-20 20:56:26 +08:00
ibuler	09d3763a02	fix a bug	2015-04-20 20:54:10 +08:00
ibuler	ea37374ea5	����django 1.6	2015-04-20 18:56:30 +08:00
ibuler	412dadce76	version 2.0.0 beta	2015-04-20 10:12:11 +08:00
halcyon	9cfe6c569d	hehe	2015-04-11 12:52:00 +08:00
halcyon	7de943c6e4	管理员仪表盘基本完成	2015-04-05 22:52:37 +08:00
halcyon	b35f1e6174	权限申请	2015-04-02 18:32:43 +08:00
halcyon	e1b9134d7f	0402	2015-04-01 18:58:10 +08:00
guanghongwei	a7800b9a7a	����Ȩ�޹���	2015-03-13 00:09:18 +08:00
guanghongwei	f0cd064195	修改 用户左侧显示	2015-02-27 22:14:09 +08:00
guanghongwei	c113035d3d	sudo perm	2015-02-06 18:39:20 +08:00
guanghongwei	96738976fb	�޸�jpermistion --> jperm ����	2015-01-24 14:46:35 +08:00
ibuler	9304a911ea	添加自定义tag	2015-01-10 23:31:32 +08:00
halcyon	0ed0853489	完善资产添加和查看资产页面	2015-01-07 18:35:09 +08:00
ibuler	bcf3281a10	添加log models ... 添加 docs目录	2014-12-26 22:54:37 +08:00
ibuler	d7b2631410	修改名称	2014-12-24 22:21:46 +08:00
ibuler	e66b1b4192	修改bug	2014-12-24 22:20:38 +08:00
ibuler	0e76d52322	修改bug	2014-12-22 23:44:48 +08:00
ibuler	ef0c9fdd16	添加model	2014-12-22 23:14:29 +08:00
guanghongwei	99f95af74e	modified settings.py set option	2014-12-22 18:34:08 +08:00
root	0b2a77fce4	Init project add LICENSE file	2014-12-21 22:13:04 +08:00