github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
6,873 Commits
72 Branches
249 Tags
112 MiB
Commit Graph

6873 Commits (ad2cb233d7beb401a1e4946dd21ec8c2aa0ab37e)

Author SHA1 Message Date
严泽 0667067c0c 捕获添加用户邮箱填写错误时邮件发送失败的异常 2015-10-13 16:36:16 +08:00
ibuler@qq.com 50d2bfb272 someday 2015-10-12 09:58:38 +08:00
ibuler@qq.com 06eedff49f fix common 2015-10-07 20:14:07 +08:00
ibuler@qq.com afbbad1604 授权管理 2015-10-07 17:16:20 +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 85dcc8ba63 WARNINGS: 
jlog.Log.pid: (fields.W122) 'max_length' is ignored when used with IntegerField
        HINT: Remove 'max_length' from field
 2015-10-07 12:20:59 +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 d3465be672 修改Ignore 2015-10-06 23:48:15 +08:00
ibuler@qq.com e99b33c51e 修改使用新表结构 2015-10-06 23:47:53 +08:00
Administrator 43fe985143 添加组授权 2015-10-06 18:51:49 +08:00
Administrator 699046dad5 修改settings 2015-10-05 23:48:03 +08:00
guanghongwei 6482a5e214 add ignore 2015-10-04 21:51:23 +08:00
guanghongwei fef3879c85 rm tmpfile 2015-10-04 21:50:51 +08:00
guanghongwei 9f7b066ca6 shouquanxiugai 2015-10-04 21:50:29 +08:00
liuzheng712 02218e624a lots 2015-10-04 19:07:42 +08:00
liuzheng712 5a5928483f lots 2015-10-04 00:53:01 +08:00
liuzheng712 11b3cee346 gitignore 2015-10-03 22:50:05 +08:00
蓝枫 949065be2c Update connect.py 
修正vim颜色
 2015-10-01 16:25:17 +08:00
蓝枫 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