Commit Graph

58 Commits (9d36dc9e395b1ff0327774a7322f263c6edbf0fa)

Author SHA1 Message Date
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
liuzheng712 02218e624a lots
9 years ago
liuzheng712 5a5928483f lots
9 years ago
liuzheng712 79c79432f5 usermodle
9 years ago
ibuler 907c2c7e97 资产修改基本完成
9 years ago
ibuler 8bf9103fcf 修改资产管理
9 years ago
ibuler 4eb78e151e 用户模块修改告一段落
9 years ago
ibuler 3efd810fe1 修改修改用户bug
9 years ago
ibuler c21cdc2131 添加忘记密码
9 years ago
ibuler 44c69ded78 干掉ldap前
9 years ago
root 1e170714c0 修改用户添加视图
9 years ago
ibuler 10d96a9767 修改用户组视图
9 years ago
ibuler fd5041965b 分离juser方法
9 years ago
ibuler 33c624c76f 删除部门后
9 years ago