github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
1,023 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

1023 Commits (7cafbde5b125c898758b7aa4a04dc922c1cc4fde)

Author SHA1 Message Date
ibuler b8d6c5d007 删除遗留的model SysUser PermLog 2015-11-20 23:12:33 +08:00
ibuler 85a9da0e8a bug fix 2015-11-20 21:59:09 +08:00
ibuler faa0275700 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-11-20 21:48:58 +08:00
ibuler eea56ea0e5 定义通用模块执行 2015-11-20 21:30:57 +08:00
ibuler ab313aacd8 定义Command前 2015-11-20 18:42:44 +08:00
yumaojun a88ee0725d 1. 在授权规则添加页面　通过js 给予用户输入提醒 2015-11-20 14:07:17 +08:00
yumaojun e57c6a9d2e 1. 在授权规则添加页面　通过js 给予用户输入提醒 2015-11-20 14:03:05 +08:00
liuzheng712 f863f4b7ae 登陆web的密码（如不修改请留空） 2015-11-20 11:26:07 +08:00
liuzheng712 4bbae38150 confirm alert 2015-11-20 11:16:47 +08:00
liuzheng712 31807b674b Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ 2015-11-20 11:12:10 +08:00
liuzheng712 75fbd9e615 annotation the Asset 2015-11-20 11:08:39 +08:00
liuzheng712 42ec624a91 group add and remove fixed 2015-11-20 11:04:22 +08:00
halcyon b4c13069c0 batch asset alert 2015-11-20 00:03:36 +08:00
ibuler 6b1b33481c 一些js, setting的KEY_DIR, 下载秘钥鉴定 2015-11-19 23:11:00 +08:00
halcyon 1471e0a247 merge cmdb and hehe 2015-11-19 22:06:12 +08:00
halcyon a04bb100bf Merge branch 'cmdb' into dev 2015-11-19 22:01:38 +08:00
halcyon f9b1d3059a fix bugs 2015-11-19 21:58:44 +08:00
ibuler bddb689e86 merge with exec_cmd 2015-11-19 21:57:17 +08:00
yumaojun 757f7beeaf update merge conflict. 2015-11-19 13:20:27 +08:00
yumaojun 6582ee1624 1. 更新 和 添加 （role 和 rule )操作 以 msg 的方式 刷新页面 2015-11-18 22:32:21 +08:00
yumaojun 04e7073aca 1. fixed ansible api auto load local host file (/etc/ansible/hosts) bug with null list 2015-11-18 19:03:13 +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 79ecbc83ae bug fix 2015-11-18 15:23:56 +08:00
ibuler 2a6051ae35 merge with dev 2015-11-18 15:22:26 +08:00
ibuler cf8e366ae1 修改connect方法 2015-11-18 15:15:08 +08:00
halcyon d42197db3a fix tower bugs 2015-11-17 23:34:13 +08:00
ibuler 8017b1b479 解决jperm key dir 和 ansible api问题 2015-11-17 23:32:24 +08:00
yumaojun 375a243131 Merge remote-tracking branch 'origin/map_perm' into dev 2015-11-17 22:18:17 +08:00
yumaojun 70e6904eb7 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev 2015-11-17 22:17:18 +08:00
ibuler 42745c52df Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-11-17 21:41:31 +08:00
ibuler 8479989ea8 更换nav ico, 修复需要登陆，登陆后跳转到登陆前页面 2015-11-17 21:41:03 +08:00
liuzheng712 ee7675f7ae fix when ./keys/user/ didn't exist bug 2015-11-17 21:06:38 +08:00
liuzheng712 37b91c40b6 url 2015-11-17 20:27:38 +08:00
liuzheng712 4027a87e7f user delete with alert confirm 2015-11-17 20:25:15 +08:00
liuzheng712 84992746de juser/change_info/ fix password can be ignore 2015-11-17 20:06:25 +08:00
liuzheng712 4397819b44 user.update bug fix 2015-11-17 19:55:38 +08:00
liuzheng712 ee443361b9 bug of user.update 2015-11-17 19:51:16 +08:00
yumaojun e5c1071073 Merge branch 'dev' into map_perm 2015-11-17 14:10:46 +08:00
yumaojun 8d941dc028 update role edit and rule edit 2015-11-17 13:55:13 +08:00
yumaojun 11f6939b85 1. update role and update rule complete. 2015-11-17 13:48:19 +08:00
liuzheng712 1c3b66c1a8 user.update 2015-11-17 11:13:52 +08:00
liuzheng712 a99f024dfc user.update 2015-11-17 11:07:40 +08:00
ibuler d58ba82388 添加ignore 2015-11-17 10:48:18 +08:00
liuzheng712 738c6353ef user.update 2015-11-17 10:44:34 +08:00
ibuler dc547de592 修正文件目录 2015-11-17 10:27:41 +08:00
liuzheng712 adf20f188e user.update 2015-11-17 10:16:51 +08:00
liuzheng712 b9b965753b Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ 2015-11-17 09:53:48 +08:00
liuzheng712 036873e129 merge_dev 2015-11-17 09:53:43 +08:00
yumaojun 9d36dc9e39 1. push role bug , because the password push is mandatory, so just the push key is option. 2015-11-16 23:44:53 +08:00
ibuler ce02d430ba deal_command添加到静态方法中 2015-11-16 23:33:44 +08:00