github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
3,383 Commits
71 Branches
249 Tags
114 MiB
Commit Graph

3383 Commits (78936bf9f2c29d113b6b31d7072778e288d20a75)

Author SHA1 Message Date
老广 99c4875dd7
Merge pull request #1395 from jumpserver/dev 
Dev
 2018-06-04 22:06:58 -05:00
ibuler 482d1bb27f [Update] 修改permisstion util 2018-06-01 16:22:52 +08:00
ibuler e7c7c3a7a8 Merge branch 'dev' into perm_tree 2018-06-01 15:41:50 +08:00
ibuler 54efc88799 Merge remote-tracking branch 'github/dev' into dev 2018-06-01 15:39:43 +08:00
ibuler a9d1538135 [Update] 修改一些方法 2018-06-01 15:34:08 +08:00
ibuler f8ff223f90 [Update] 更新api和model方法 2018-05-31 19:47:57 +08:00
老广 a3f1622a50
Merge pull request #1371 from jumpserver/fix_asset_count 
[Update] 修改资产树节点(数量)总显示此节点以及子孙节点下的所有资产总数
 2018-05-31 12:31:44 +08:00
老广 0021f2e5e1
Merge pull request #1377 from wojiushixiaobai/dev 
[Update]更新自动升级脚本
 2018-05-31 12:29:21 +08:00
wojiushixiaobai dbcad47214 更新升级文档 2018-05-30 11:23:54 +08:00
wojiushixiaobai 6c384b49fe 修改脚本 2018-05-30 11:19:37 +08:00
BaiJiangJie 526943a041 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev 2018-05-29 19:26:19 +08:00
BaiJiangJie e9d0104a69 Merge branch 'dev' of github.com:jumpserver/jumpserver into fix_asset_count_dev 2018-05-29 19:20:03 +08:00
BaiJiangJie 7c694c6885 [Update] 合并Node的parent.setter方法，修改node_fake的parent逻辑 2018-05-29 19:19:35 +08:00
ibuler 69e5ab438a [Bugfix] 解决发送邮件重启的问题 2018-05-29 18:58:56 +08:00
ibuler 757a31a52f [Update] 优化asset api, 获取时增加prefetch 2018-05-29 13:19:58 +08:00
BaiJiangJie 5b53cfb4dd [Update] 修改资产树节点(数量)总显示此节点下的资产总数 2018-05-29 11:50:09 +08:00
ibuler b0710c42b0 Merge remote-tracking branch 'github/dev' into dev 2018-05-29 11:27:56 +08:00
老广 d9d82cea5e
Merge pull request #1370 from jumpserver/fix_asset_count 
[Update] 修改资产树和资产列表数量显示(游离资产)
 2018-05-29 11:26:23 +08:00
老广 4f521e5a94
Merge pull request #1369 from gengkeye/master 
录像回放API BUG： SessionReplayViewSet
 2018-05-29 11:20:23 +08:00
BaiJiangJie 3a2973023c [Update] 修改资产树和资产列表数量显示(游离资产) 2018-05-29 11:17:09 +08:00
oldseven 4f28f85410 #1368 2018-05-29 09:51:55 +08:00
oldseven a1905ecfdb Merge branch 'master' of https://github.com/jumpserver/jumpserver 
Conflicts:
	apps/terminal/api.py
 2018-05-29 09:39:30 +08:00
ibuler 47397d2308 [Bugfix] 修复网关测试连接需要ssh信任key的问题 2018-05-28 16:44:00 +08:00
ibuler 7b57d24dc9 [Update] 优化代码 2018-05-28 15:00:06 +08:00
老广 f2216274c5
Merge pull request #1366 from jumpserver/dev 
Dev
 2018-05-28 13:26:04 +08:00
ibuler ffabef0040 Merge branch 'large' into dev 2018-05-28 13:20:58 +08:00
ibuler 0b4df78393 [Update] 修改permistion utils优化返回的属性 2018-05-28 13:20:26 +08:00
BaiJiangJie 2fab69ca61 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev 2018-05-28 11:15:48 +08:00
老广 7987056b12
Merge pull request #1365 from jumpserver/dev 
Dev修复
 2018-05-28 11:05:11 +08:00
BaiJiangJie f9ab0abc37 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev 2018-05-28 10:58:47 +08:00
ibuler 0bc86543b5 [Update] 修改用户组详情显示授权资产的bug 2018-05-26 21:53:50 +08:00
ibuler fc2a44621b [Bugfix] 修复右击位置不对的bug 2018-05-25 19:17:57 +08:00
ibuler 9b4b9e6900 [Update] 发送邮件增加用户名显示 2018-05-25 18:13:48 +08:00
老广 62c114d9c4
Merge pull request #1362 from jumpserver/dev 
修改树形结构
 2018-05-25 17:53:40 +08:00
ibuler 22a84d57ca [Update] 修改树形结构 2018-05-25 17:32:10 +08:00
ibuler 3f4b5ad465 [Update] Merge 2018-05-25 17:28:53 +08:00
ibuler a96bda8ca9 [Update] 修改树形结构 2018-05-25 17:26:57 +08:00
ibuler bff3868b8f [Update] 统一requirements版本 2018-05-25 15:23:52 +08:00
老广 8470dce805
Merge pull request #1357 from jumpserver/dev 
Dev
 2018-05-24 18:58:47 +08:00
ibuler b9d0d89f66 [Update] 更改版本好 2018-05-24 13:32:20 +08:00
ibuler 5a7192e035 [Update] 修改心跳bug 2018-05-24 13:30:15 +08:00
BaiJiangJie de2416b173 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev 2018-05-24 12:42:06 +08:00
BaiJiangJie 486793ddcd [Bugfix] 修复取消LDAP认证不成功bug 2018-05-24 12:41:48 +08:00
老广 c40c5ac543
Merge pull request #1355 from jumpserver/dev 
调整Luna树形结构修复一些bug
 2018-05-24 11:39:01 +08:00
ibuler c529061ee0 [Bugfix] 修复授权uitls的错误 2018-05-24 11:18:20 +08:00
ibuler fe52c57a11 [Bugfix] 修复授权uitls的错误 2018-05-24 11:13:22 +08:00
ibuler f8384973a1 [Update] 调整Luna的树形结构 2018-05-23 15:15:27 +08:00
ibuler dc1d228e07 [Update] 更新requirements 2018-05-22 19:44:13 +08:00
ibuler 092b33d4d1 [Update] 更新requirements 2018-05-22 19:30:15 +08:00
ibuler d615eb80b5 [Update] 优化使用storage sdk 2018-05-22 18:22:06 +08:00