github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
1,103 Commits
68 Branches
248 Tags
109 MiB
Commit Graph

91 Commits (7ce12af1463918adb79c61a74b73ca5408df5fcd)

Author SHA1 Message Date
ibuler e03b4722b0 defend attack 2015-12-10 14:10:47 +08:00
ibuler e408414631 bug fix 2015-12-08 19:25:11 +08:00
ibuler 95e8115045 bug fix 2015-12-07 23:29:19 +08:00
ibuler b7cfac4d1f bug fix 2015-12-07 23:21:10 +08:00
ibuler 5be2633795 bug fix 2015-12-07 18:06:07 +08:00
ibuler cb12b83e47 bug fix 2015-12-07 17:41:29 +08:00
ibuler cd798daf0a bug fix 2015-12-07 17:30:57 +08:00
ibuler 622611498c fix bug 2015-12-06 23:33:23 +08:00
ibuler bf23d6d7aa fix some bug 2015-12-06 22:00:44 +08:00
ibuler 35c818f4a0 用户详情 2015-12-06 00:28:43 +08:00
ibuler e95c47ff6a upload 2015-12-01 19:23:35 +08:00
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 ea059790a9 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ 2015-11-21 21:24:17 +08:00
liuzheng712 6ae4907520 update 2015-11-21 21:24:01 +08:00
ibuler 93481a98db 完成登陆，批量执行命令流 2015-11-21 19:20:11 +08:00
ibuler faa0275700 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-11-20 21:48:58 +08:00
ibuler eea56ea0e5 定义通用模块执行 2015-11-20 21:30:57 +08:00
liuzheng712 31807b674b Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ 2015-11-20 11:12:10 +08:00
liuzheng712 42ec624a91 group add and remove fixed 2015-11-20 11:04:22 +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 37b91c40b6 url 2015-11-17 20:27:38 +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 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
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 2938f7e506 update 2015-11-16 14:30:10 +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
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 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 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 0f8abb6026 update 2015-11-05 22:53:19 +08:00