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

7803 Commits (7560a5cd1f3a1d32f49ea92392420a89e731e623)

Author SHA1 Message Date
蓝枫 6168ab270f Merge pull request #19 from IYism/master 
bugfix：connect.py log_online.html
 2015-09-25 17:20:48 +08:00
IYism 667862223c bugfix 
修复chrome浏览器有时候不能阻断的bug
 2015-09-25 16:33:11 +08:00
IYism 2f5cf429ed bugfix ip_list 
bugfix ip_list
 2015-09-25 16:30:15 +08:00
liuzheng712 7a94724dbc initial_data_test 2015-09-24 09:43:28 +08:00
liuzheng712 79c79432f5 usermodle 2015-09-15 23:38:06 +08:00
ibuler d32ea9f9a1 授权管理 2015-09-11 00:04:07 +08:00
ibuler 907c2c7e97 资产修改基本完成 2015-09-10 22:51:42 +08:00
ibuler 960e45d0fa 添加asset_api 2015-09-09 00:19:36 +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
蓝枫 a4ac98332b Merge pull request #15 from xiaopeng163/master 
Delete .DS_Store file
 2015-08-31 10:32:06 +08:00
Peng Xiao 073e7b36fa Delete .DS_Store file 
.DS_Store is the name of a file in the Apple OS X operating system for storing custom attributes of a folder such as the position of icons or the choice of a background image.
 2015-08-31 10:28:54 +08:00
ibuler 44c69ded78 干掉ldap前 2015-08-30 14:03:10 +08:00
root 1e170714c0 修改用户添加视图 2015-08-29 00:09:36 +08:00
ibuler f47cddbd5c 修改cpu占用问题 2015-08-28 10:04:07 +08:00
ibuler 1387e29591 解决cpu占用过大问题 2015-08-28 09:58:20 +08:00
ibuler 10d96a9767 修改用户组视图 2015-08-28 00:33:54 +08:00
ibuler fd5041965b 分离juser方法 2015-08-27 00:08:45 +08:00
ibuler 33c624c76f 删除部门后 2015-08-27 00:08:20 +08:00
ibuler 913f93b91f 删除部门前 2015-08-26 23:31:32 +08:00
蓝枫 d34ec00a3a Merge pull request #14 from pengyao/master 
exact match， thanks for pengyao
 2015-08-26 16:12:36 +08:00
pengyao e9c6924530 exact match 2015-08-26 16:06:22 +08:00
ibuler c1facb939e 优化connect.py排序 2015-08-22 00:01:54 +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
蓝枫 a040b1c181 Update connect.py 
fix cpu used 100%
 2015-07-21 10:26:49 +08:00
蓝枫 8121e4942b Merge pull request #13 from ljjjustin/master 
fix error url in host search page
 2015-07-08 19:20:00 +08:00
Jiajun Liu f5e57da106 fix line break bug on add multiple hosts 2015-07-07 18:12:25 +08:00
Jiajun Liu b8dfb26a3a fix error url in host search page 2015-07-07 17:44:12 +08:00
蓝枫 079338f89d Merge pull request #12 from ljjjustin/master 
fix user can not get login logs bug
 2015-07-07 17:13:18 +08:00
Jiajun Liu 627d627995 fix user can not get login logs bug 2015-07-07 16:59:24 +08:00
Jiajun Liu 19343540b9 fix line break bug 
some system user '\n\r' as line break, if we split commands by '\n',
then '\r' will be considered as part of commands which will break sudo
authentication. we can use splitlines function to avoid the problem.
 2015-07-07 16:59:24 +08:00
Jiajun Liu 915adb2fd3 fix user can not get permission applies bug 2015-07-07 16:59:21 +08:00
ibuler c25cd3c005 Merge remote-tracking branch 'remotes/github/master' 2015-07-03 21:29:25 +08:00
ibuler 32ab051bbc modify cmd_group num bug 2015-07-03 21:27:20 +08:00
ibuler f7e70e56e3 modify sudo conn timeout bug 2015-07-03 21:09:17 +08:00
ibuler 9e52e6a320 modify some 2015-07-03 20:45:45 +08:00
ibuler f3a0c390b1 connect.py base ok 2015-06-16 09:21:11 +08:00
ibuler bb32c0480c dev 2015-06-15 23:00:19 +08:00
ibuler 8d167baf46 modify some 2015-06-15 19:20:05 +08:00
蓝枫 acfa0171ca Update log_offline.html 
a small bug
 2015-06-15 16:06:12 +08:00
ibuler fdcaa358e5 modify some api.py bug 2015-06-13 00:36:10 +08:00
ibuler ce8e1e0ae3 Merge remote-tracking branch 'remotes/github/master' 2015-06-11 14:05:16 +08:00
ibuler 7cb4ff97ea modify cmd_edit bug 2015-06-11 14:01:49 +08:00
ibuler 5d16836b05 modify connect.py 2015-06-10 23:16:24 +08:00
ibuler fc22677f3f modify some 2015-06-09 23:06:32 +08:00
蓝枫 787a2591c4 Update layer.min.js 
update url
 2015-06-09 16:30:59 +08:00
ibuler 95cc2830c8 resolve kill process bug 2015-06-09 09:49:31 +08:00