github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
934 Commits
100 Branches
262 Tags
144 MiB
Commit Graph

29 Commits (4cdc7f33ced3fe77d9bb31055a798f778ddbba8d)

Author SHA1 Message Date
ibuler 93481a98db 完成登陆，批量执行命令流 2015-11-21 19:20:11 +08:00
ibuler eea56ea0e5 定义通用模块执行 2015-11-20 21:30:57 +08:00
ibuler 6b1b33481c 一些js, setting的KEY_DIR, 下载秘钥鉴定 2015-11-19 23:11:00 +08:00
liuzheng712 ee7675f7ae fix when ./keys/user/ didn't exist bug 2015-11-17 21:06:38 +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
liuzheng712 738c6353ef user.update 2015-11-17 10:44:34 +08:00
ibuler 67771105ae key目录变化 2015-11-16 22:45:41 +08:00
liuzheng712 1f5fa9a9bd merge 2015-11-16 14:21:21 +08:00
yumaojun 844fe2c250 add asset ok ,pull 2015-11-15 23:43:19 +08:00
yumaojun 6da97c5403 merge dev ... 2015-11-15 23:30:37 +08:00
广宏伟 333ee713d4 解决分页bug，和random_pass 2015-11-15 18:20:34 +08:00
广宏伟 b8ae0ed565 some bug fix 2015-11-15 17:01:02 +08:00
liuzheng712 6db7642331 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ 2015-11-09 16:58:55 +08:00
ibuler 91b5d039cc 修改邮件settings 2015-11-09 16:28:10 +08:00
liuzheng712 d369d4b50f Merge branch 'jlog' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ 
# Conflicts:
#	jumpserver/views.py
#	juser/models.py
#	juser/views.py
#	templates/jperm/perm_apply.html
 2015-11-07 09:37:10 +08:00
liuzheng712 09087a4d8f set user password , if you don't want to change the password , leave password empty 2015-11-05 14:30:59 +08:00
ibuler c8c0061244 添加权限鉴定 2015-11-04 16:24:52 +08:00
ibuler@qq.com 0e24ebdb26 merge with dev 2015-10-29 11:11:05 +08:00
ibuler@qq.com 72a18d6abf use map 2015-10-24 23:52:06 +08:00
liuzheng712 ce90472624 juser/user_list change user password fix 2015-10-07 12:31:40 +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 3efd810fe1 修改修改用户bug 2015-09-02 21:42:31 +08:00
ibuler c21cdc2131 添加忘记密码 2015-08-31 23:04:53 +08:00
ibuler 44c69ded78 干掉ldap前 2015-08-30 14:03:10 +08:00
root 1e170714c0 修改用户添加视图 2015-08-29 00:09:36 +08:00
ibuler 10d96a9767 修改用户组视图 2015-08-28 00:33:54 +08:00
ibuler fd5041965b 分离juser方法 2015-08-27 00:08:45 +08:00