github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
1,030 Commits
72 Branches
250 Tags
115 MiB
Commit Graph

30 Commits (f72c5753c9c4b96e0976a3a993bb571ca365bfc4)

Author SHA1 Message Date
liuzheng712 2938f7e506 update 2015-11-16 14:30:10 +08:00
liuzheng712 1f5fa9a9bd merge 2015-11-16 14:21:21 +08:00
yumaojun 6da97c5403 merge dev ... 2015-11-15 23:30:37 +08:00
yumaojun 95dc12a71b update models 2015-11-14 23:17:05 +08:00
yumaojun 012950cb68 merge update... 2015-11-14 23:07:08 +08:00
yumaojun 9379bc1f6e merge failed, update.... 2015-11-13 13:06:17 +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 f220ea367e upload file with user id path 2015-11-06 22:26:19 +08:00
liuzheng712 7a25f348e4 upload file: save a copy in ./upload/%Y/%M/%D/. TODO: distinguish userID 2015-11-06 00:56:16 +08:00
Zi Chuanxiu 26e3634814 mapping model 2015-11-05 22:47:45 +08:00
ibuler@qq.com 0e24ebdb26 merge with dev 2015-10-29 11:11:05 +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
ibuler@qq.com afbbad1604 授权管理 2015-10-07 17:16:20 +08:00
liuzheng712 c9e192fae4 recovery User's function 2015-10-07 12:17:20 +08:00
liuzheng712 cee8b2d787 rollback jumpserver/views.py 54 : user = get_object() part and delete useless 'class CustomUser' 2015-10-07 12:01:14 +08:00
ibuler@qq.com e99b33c51e 修改使用新表结构 2015-10-06 23:47:53 +08:00
Administrator 43fe985143 添加组授权 2015-10-06 18:51:49 +08:00
guanghongwei 9f7b066ca6 shouquanxiugai 2015-10-04 21:50:29 +08:00
liuzheng712 5a5928483f lots 2015-10-04 00:53:01 +08:00
liuzheng712 79c79432f5 usermodle 2015-09-15 23:38:06 +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
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 ad16d8b532 优化connect.py 和 api.py 2015-08-21 23:45:41 +08:00
Guang 9f0620f97e 调整User,UserGroup类 2015-08-20 23:42:27 +08:00
ibuler f3a0c390b1 connect.py base ok 2015-06-16 09:21:11 +08:00
ibuler 412dadce76 version 2.0.0 beta 2015-04-20 10:12:11 +08:00