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

45 Commits (7106e915efb4369ec074d9f2f81c80e0eac2f88c)

Author SHA1 Message Date
ibuler 8dd4a9fce1 push role 更改 2015-11-29 19:02:13 +08:00
liuzheng712 c89d43d269 update, now Mac to develop will be all egg pain 2015-11-22 22:20:55 +08:00
liuzheng712 09de12c02a index show assets, need discussion 2015-11-22 13:04:11 +08:00
liuzheng712 246e8770ac http://localhost:8000/juser/user_detail/?id=5001 fix 2015-11-21 22:40:28 +08:00
liuzheng712 6ae4907520 update 2015-11-21 21:24:01 +08:00
liuzheng712 42ec624a91 group add and remove fixed 2015-11-20 11:04:22 +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
liuzheng712 738c6353ef user.update 2015-11-17 10:44:34 +08:00
liuzheng712 adf20f188e user.update 2015-11-17 10:16:51 +08:00
ibuler 67771105ae key目录变化 2015-11-16 22:45:41 +08:00
liuzheng712 d3dd9d94d3 update 2015-11-16 14:59:26 +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
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 cab346686d update 2015-11-07 10:27:55 +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 ba8ed23292 add the @login_required(login_url='/login') 2015-11-02 15:51:18 +08:00
ibuler@qq.com 0e24ebdb26 merge with dev 2015-10-29 11:11:05 +08:00
liuzheng712 ac5ac5e06b change role finished , but need more think 2015-10-28 21:03:54 +08:00
liuzheng712 4d3e7d694b lots 2015-10-28 10:55:25 +08:00
liuzheng712 ca271900e6 remove request.session user_id and role_id, about role_id need more think, now is dirty 2015-10-27 23:57:37 +08:00
liuzheng712 f8c8c3deff update 2015-10-27 23:34:38 +08:00
广宏伟 40d00f7cbd lost playboo_run 2015-10-21 20:44:28 +08:00
liuzheng712 9d5c4dbb33 juser/user_list change user password fix 2015-10-07 12:36:20 +08:00
liuzheng712 ce90472624 juser/user_list change user password fix 2015-10-07 12:31:40 +08:00
liuzheng712 5a5928483f lots 2015-10-04 00:53:01 +08:00
ibuler 907c2c7e97 资产修改基本完成 2015-09-10 22:51:42 +08:00
ibuler 8bf9103fcf 修改资产管理 2015-09-09 00:19:17 +08:00
ibuler 4eb78e151e 用户模块修改告一段落 2015-09-06 21:37:22 +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 33c624c76f 删除部门后 2015-08-27 00:08:20 +08:00
ibuler 913f93b91f 删除部门前 2015-08-26 23:31:32 +08:00
Guang 9f0620f97e 调整User,UserGroup类 2015-08-20 23:42:27 +08:00
ibuler 9e52e6a320 modify some 2015-07-03 20:45:45 +08:00
ibuler 311b65da00 ޸bug 2015-04-22 18:57:55 +08:00
ibuler 412dadce76 version 2.0.0 beta 2015-04-20 10:12:11 +08:00