Commit Graph

71 Commits (f863f4b7aedbf3924846a5bbb03ecb653333abd2)

Author SHA1 Message Date
liuzheng712 31807b674b Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ
9 years ago
liuzheng712 42ec624a91 group add and remove fixed
9 years ago
ibuler 6b1b33481c 一些js, setting的KEY_DIR, 下载秘钥鉴定
9 years ago
liuzheng712 ee7675f7ae fix when ./keys/user/ didn't exist bug
9 years ago
liuzheng712 37b91c40b6 url
9 years ago
liuzheng712 84992746de juser/change_info/ fix password can be ignore
9 years ago
liuzheng712 4397819b44 user.update bug fix
9 years ago
liuzheng712 ee443361b9 bug of user.update
9 years ago
liuzheng712 1c3b66c1a8 user.update
9 years ago
liuzheng712 a99f024dfc user.update
9 years ago
liuzheng712 738c6353ef user.update
9 years ago
liuzheng712 adf20f188e user.update
9 years ago
ibuler 67771105ae key目录变化
9 years ago
liuzheng712 d3dd9d94d3 update
9 years ago
liuzheng712 2938f7e506 update
9 years ago
liuzheng712 1f5fa9a9bd merge
9 years ago
yumaojun 844fe2c250 add asset ok ,pull
9 years ago
yumaojun 6da97c5403 merge dev ...
9 years ago
广宏伟 333ee713d4 解决分页bug,和random_pass
9 years ago
广宏伟 b8ae0ed565 some bug fix
9 years ago
yumaojun 95dc12a71b update models
9 years ago
yumaojun 012950cb68 merge update...
9 years ago
yumaojun 9379bc1f6e merge failed, update....
9 years ago
liuzheng712 6db7642331 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ
9 years ago
ibuler 91b5d039cc 修改邮件settings
9 years ago
liuzheng712 cab346686d update
9 years ago
liuzheng712 d369d4b50f Merge branch 'jlog' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ
9 years ago
liuzheng712 f220ea367e upload file with user id path
9 years ago
liuzheng712 7a25f348e4 upload file: save a copy in ./upload/%Y/%M/%D/. TODO: distinguish userID
9 years ago
Zi Chuanxiu 0f8abb6026 update
9 years ago
Zi Chuanxiu 26e3634814 mapping model
9 years ago
liuzheng712 09087a4d8f set user password , if you don't want to change the password , leave password empty
9 years ago
ibuler c8c0061244 添加权限鉴定
9 years ago
liuzheng712 ba8ed23292 add the @login_required(login_url='/login')
9 years ago
liuzheng712 a3bea76994 juser/urls.py format
9 years ago
ibuler@qq.com 0e24ebdb26 merge with dev
9 years ago
liuzheng712 ac5ac5e06b change role finished , but need more think
9 years ago
liuzheng712 4d3e7d694b lots
9 years ago
liuzheng712 ca271900e6 remove request.session user_id and role_id, about role_id need more think, now is dirty
9 years ago
liuzheng712 f8c8c3deff update
9 years ago
ibuler@qq.com 72a18d6abf use map
9 years ago
广宏伟 40d00f7cbd lost playboo_run
9 years ago
ibuler@qq.com afbbad1604 授权管理
9 years ago
liuzheng712 9d5c4dbb33 juser/user_list change user password fix
9 years ago
liuzheng712 ce90472624 juser/user_list change user password fix
9 years ago
liuzheng712 c9e192fae4 recovery User's function
9 years ago
liuzheng712 cee8b2d787 rollback jumpserver/views.py 54 : user = get_object() part and delete useless 'class CustomUser'
9 years ago
ibuler@qq.com e99b33c51e 修改使用新表结构
9 years ago
Administrator 43fe985143 添加组授权
9 years ago
guanghongwei 9f7b066ca6 shouquanxiugai
9 years ago