github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
3,931 Commits
87 Branches
259 Tags
138 MiB
Commit Graph

3931 Commits (5de6563ab212005accfe1ff0eca0df676f0f7103)

Author SHA1 Message Date
ibuler e5285f312b [Bugfix] 修复vnc录像的bug 2018-12-19 19:55:41 +08:00
老广 332be54b46
Vnc (#2226) 
* [Update] 优化授权协议, 支持vnc

* [Update] 添加协议vnc

* [Update] 修改系统用户添加

* [Update] 修改vnc信息
 2018-12-19 19:40:58 +08:00
老广 fe7c3c29ad
[Update] 优化授权协议, 支持vnc (#2220) 
* [Update] 优化授权协议, 支持vnc
 2018-12-19 17:03:10 +08:00
老广 0e9ebed19d
Merge pull request #2214 from jumpserver/dev 
Dev
 2018-12-19 13:57:15 +08:00
老广 4a3327bc4b
Merge pull request #2213 from jumpserver/bugfix 
[Bugfix] 修复录像bug
 2018-12-19 13:56:30 +08:00
ibuler 5d47bebb6b [Bugfix] 修复录像bug 2018-12-19 13:55:49 +08:00
老广 2ece3545ed
Merge pull request #2210 from jumpserver/dev 
Dev
 2018-12-19 12:33:34 +08:00
ibuler a9a1bae805 [Update] 修改列表页，显示可连接状态 2018-12-19 12:32:53 +08:00
ibuler f35c02b346 [Update] 修改列表页，显示可连接状态 2018-12-19 12:30:51 +08:00
老广 32df515f4b
Merge pull request #2209 from jumpserver/dev 
Dev
 2018-12-19 12:02:16 +08:00
ibuler 71750970b2 [Update] 暂时去掉刷新资产树 2018-12-19 12:01:18 +08:00
ibuler a85099ee60 [Update] 修改版本号 2018-12-19 11:43:13 +08:00
老广 a5b9b4e1d2
Merge pull request #2206 from jumpserver/dev 
Dev
 2018-12-19 10:53:00 +08:00
老广 b3079a4a9b
[Update] Add index (#2208) 2018-12-19 10:49:30 +08:00
ibuler 9a22874305 [Update] 去掉多余的任务 2018-12-18 20:14:44 +08:00
ibuler 179018bf67 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2018-12-18 20:07:16 +08:00
ibuler 583214e91a [Update] 优化获取授权资产api 2018-12-18 20:01:59 +08:00
BaiJiangJie fb44ef0986 [Bugfix] 修复 资产授权/标签 选择资产时，input框内的资产和弹出资产tabl显示不一致的bug (#2205) 
* [Bugfix] 修复授权规则，选择资产时，输入框资产和弹出表格中资产显示不一致

* [Bugfix] 修复创建/更新资产标签，选择资产时，输入框资产和弹出表格中资产显示不一致的bug

* [Update] 修复标签/授权选择资产时, 2次初始化table的bug；资产input和弹出table统一的代码逻辑移到js中;
 2018-12-18 18:50:02 +08:00
ibuler 90b77fdb08 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2018-12-18 17:30:59 +08:00
老广 a609f17078
[Update] Stash it (#2197) 
* [Update] Stash it

* [Bugfix] 修复错误

* [Update] 修改jms
 2018-12-18 17:28:45 +08:00
ibuler 068a280350 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2018-12-18 11:38:42 +08:00
老广 1293d72189
Session task (#2196) 
* [Bugfix] 修复错误

* [Update] 增加会话定期清理
 2018-12-18 11:29:21 +08:00
ibuler 164c5ebabd Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2018-12-18 09:52:25 +08:00
老广 b56d73ba9e
Node asset amount (#2192) 
* [Bugfix] 修复错误

* [Update] 优化用户api
 2018-12-17 20:09:25 +08:00
ibuler dbdcdb722d Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2018-12-17 18:21:51 +08:00
老广 517a27ea33
Node asset amount (#2191) 
* [Bugfix] 修复错误

* [Update] 修改树结构，统一api
 2018-12-17 18:20:44 +08:00
vkill ab6c88823d Support for TOTP valid_window configuration (#2187) 2018-12-17 14:26:00 +08:00
ibuler 1ff9f0eaa6 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2018-12-17 11:50:18 +08:00
老广 b95f8a7d6b
[Update] 修复获取节点数量比较慢的问题 (#2184) 2018-12-17 11:49:57 +08:00
ibuler 29ff0efdc1 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2018-12-17 11:45:37 +08:00
老广 985bd6fc82
Bugfix2 (#2183) 
* [Bugfix] 修复错误

* [Bugfix] 修复一些bug
 2018-12-17 11:44:43 +08:00
BaiJiangJie 374039d287 [Update] 终端设置，添加coco端资产列表页面大小配置项 (#2182) 
* [Update] 终端设置，添加coco端资产列表页面大小配置项

* [Update] 添加页面大小选项
 2018-12-17 11:18:55 +08:00
ibuler c7ac93fcc1 [Bugfix] 修复错误 2018-12-17 10:21:16 +08:00
老广 ac7e3e7f97
Merge pull request #2161 from jumpserver/dev 
[Update] 更改readme
 2018-12-13 10:16:08 +08:00
ibuler 4e0b25ae0f [Update] 更改readme 2018-12-13 10:15:31 +08:00
老广 559f4d2f5c
Merge pull request #2160 from jumpserver/dev 
[Bugfix] 修复access key的错误
 2018-12-13 10:08:16 +08:00
ibuler f40f6bc61e [Bugfix] 修复accekt的错误 2018-12-13 10:06:51 +08:00
老广 0f61b36bff
Merge pull request #2155 from jumpserver/dev 
Dev
 2018-12-12 18:04:27 +08:00
ibuler 55ff82545a [Bugfix] 修复任务执行args为空的bug 2018-12-12 18:03:28 +08:00
ibuler a99d5609fa [Bugfix] 修复运行测试硬件等报错的bug 2018-12-12 18:00:21 +08:00
老广 dbc2779b34
Merge pull request #2151 from jumpserver/dev 
Dev
 2018-12-12 15:58:57 +08:00
ibuler 33b1de0d85 [Update] 优化一下 2018-12-12 15:56:36 +08:00
ibuler bcfe82f162 [Update] 优化错误颜色 2018-12-12 12:40:45 +08:00
ibuler 82af5f8f16 [Update] 资产详情页面增加网域 2018-12-12 12:28:13 +08:00
ibuler 84f52eb337 [Update] 修改api 2018-12-12 12:11:12 +08:00
老广 f00a650366
Merge pull request #2145 from jumpserver/dev 
Dev
 2018-12-12 10:54:41 +08:00
ibuler 2fedeb9834 [Update] 修改命令错误输出 2018-12-12 10:41:28 +08:00
ibuler daadcedc21 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2018-12-12 09:57:26 +08:00
ibuler 951e8261ad [Update] 修改版本 2018-12-12 09:57:02 +08:00
老广 9c0f00f625
[Update] 修改命令执行 (#2148) 
* [Update] 修改命令执行

* Update forms.py
 2018-12-11 20:32:55 +08:00