434 Commits (8880b5ff4f75fe426f5df0a69a0aee29527a2dbc)

Author	SHA1	Message	Date
ibuler	60166ac008	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	9 years ago
ibuler	f760df1e34	角色key问题修复	9 years ago
ibuler	6fe6342ca4	角色key问题修复	9 years ago
liuzheng712	175f2702d1	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ	9 years ago
ibuler	a7db713b1e	Merge branch 'exec_cmd' into dev	9 years ago
wangyong	742e56fc5f	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	9 years ago
wangyong	0262d94dd3	fix disk detail bug	9 years ago
ibuler	32d036c2b0	修改setting字段	9 years ago
ibuler	1a63d32fe3	fix bug	9 years ago
ibuler	7cbb7718eb	fix bug	9 years ago
wangyong	49821062fb	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	9 years ago
wangyong	99439be04f	add update all button	9 years ago
halcyon	34031bfd6b	fix bugs	9 years ago
ibuler	a7a030fedd	fix bug	9 years ago
ibuler	4c50551249	fix some bug	9 years ago
ibuler	483ca9677c	资产列表添加连接	9 years ago
ibuler	f00a2e003d	Merge branch 'dev' into exec_cmd	9 years ago
wangyong	5a3c11f619	asset update batch and crontab	9 years ago
liuzheng712	c89d43d269	update, now Mac to develop will be all egg pain	9 years ago
liuzheng712	962d16172c	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ	9 years ago
ibuler	4cdc7f33ce	添加注释	9 years ago
wangyong	b8cb6f4246	Merge branch 'dev' into cmdb	9 years ago
wangyong	d25e23623a	fix bugs	9 years ago
ibuler	a143797ac9	修改gen_resource api	9 years ago
liuzheng712	09de12c02a	index show assets, need discussion	9 years ago
liuzheng712	ea059790a9	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ	9 years ago
liuzheng712	6ae4907520	update	9 years ago
wangyong	0ebb7c4f9a	merge cmdb	9 years ago
wangyong	652ea98a2b	alert ip -> hostname	9 years ago
ibuler	faa0275700	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	9 years ago
ibuler	ab313aacd8	定义Command前	9 years ago
yumaojun	a88ee0725d	1. 在授权规则添加页面　通过js 给予用户输入提醒	9 years ago
liuzheng712	f863f4b7ae	登陆web的密码（如不修改请留空）	9 years ago
liuzheng712	4bbae38150	confirm alert	9 years ago
halcyon	b4c13069c0	batch asset alert	9 years ago
ibuler	6b1b33481c	一些js, setting的KEY_DIR, 下载秘钥鉴定	9 years ago
halcyon	a04bb100bf	Merge branch 'cmdb' into dev	9 years ago
halcyon	f9b1d3059a	fix bugs	9 years ago
yumaojun	757f7beeaf	update merge conflict.	9 years ago
yumaojun	6582ee1624	1. 更新 和 添加 （role 和 rule )操作 以 msg 的方式 刷新页面	9 years ago
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='*')	9 years ago
halcyon	d42197db3a	fix tower bugs	9 years ago
yumaojun	70e6904eb7	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	9 years ago
ibuler	42745c52df	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	9 years ago
ibuler	8479989ea8	更换nav ico, 修复需要登陆，登陆后跳转到登陆前页面	9 years ago
liuzheng712	4027a87e7f	user delete with alert confirm	9 years ago
liuzheng712	84992746de	juser/change_info/ fix password can be ignore	9 years ago
yumaojun	e5c1071073	Merge branch 'dev' into map_perm	9 years ago
yumaojun	11f6939b85	1. update role and update rule complete.	9 years ago
liuzheng712	036873e129	merge_dev	9 years ago