ibuler
|
28e8f204ec
|
Merge remote-tracking branch 'github/dev' into dev
|
2018-07-24 16:41:17 +08:00 |
ibuler
|
80f147cf13
|
[Update] 修改settings
|
2018-07-24 16:40:41 +08:00 |
老广
|
c816875f28
|
[Update] 修改permission (#1574)
|
2018-07-22 23:55:13 -05:00 |
ibuler
|
1c56ba5a11
|
[Update] paramiko => 2.4.1
|
2018-07-20 18:48:57 +08:00 |
老广
|
2208d6d51e
|
[Bugfix] 解决Node.root() 死循环,移动AdminRequired到permission中 (#1571)
|
2018-07-20 05:42:01 -05:00 |
ibuler
|
e3aa18ff2d
|
[Update] 修改get_current_org 为 proxy对象 current_org
|
2018-07-20 17:49:47 +08:00 |
ibuler
|
b5f6f80ae6
|
[Update] 修改Node
|
2018-07-20 13:25:50 +08:00 |
ibuler
|
bbe4080008
|
[Update] 删掉Premiddleware
|
2018-07-20 12:15:45 +08:00 |
ibuler
|
cd797b18fb
|
Merge remote-tracking branch 'github/dev' into dev
|
2018-07-20 11:10:51 +08:00 |
ibuler
|
b6523da603
|
[Update] 修改外键为org_id
|
2018-07-20 10:54:16 +08:00 |
ibuler
|
c24f1a0517
|
[Update] 修改约束
|
2018-07-19 19:24:29 +08:00 |
BaiJiangJie
|
83f220d7de
|
[Feature] 添加命令记录下载功能 (#1559)
* [Feature] 添加命令记录下载功能
* [Update] 文案修改,导出记录、提交,取消全部命令导出
* [Update] 命令导出,修复时间问题
|
2018-07-19 05:36:52 -05:00 |
老广
|
8e42a65736
|
Merge pull request #1560 from wojiushixiaobai/dev
[Update]替换淘宝IP查询接口
|
2018-07-19 05:03:59 -05:00 |
wojiushixiaobai
|
e1fff18ce3
|
替换淘宝IP查询接口
|
2018-07-19 14:14:58 +08:00 |
ibuler
|
3052744203
|
[Update] 添加eventlet
|
2018-07-18 19:17:20 +08:00 |
ibuler
|
7924b094f8
|
[Update] gunicorn不使用eventlet
|
2018-07-18 16:15:35 +08:00 |
ibuler
|
c94d018d7e
|
[Bugfix] 修复转义引起的中文乱码问题
|
2018-07-18 15:31:14 +08:00 |
ibuler
|
ce1fc0f3e2
|
[Bugfix] 修复授权列表引起的分页bug
|
2018-07-18 15:26:58 +08:00 |
ibuler
|
c215278978
|
[Bugfix] 修复授权列表引起的分页bug
|
2018-07-18 15:24:58 +08:00 |
ibuler
|
fd5f562cbf
|
[Update] stash it
|
2018-07-18 12:57:08 +08:00 |
老广
|
2cb5876d1a
|
Merge branch 'master' into dev
|
2018-07-17 04:25:37 -05:00 |
ibuler
|
8883e0090f
|
[Update] 更改版本号
|
2018-07-17 17:12:28 +08:00 |
ibuler
|
790652ff4d
|
[Update] 修改协议小问题
|
2018-07-17 17:09:36 +08:00 |
ibuler
|
ff3f74abe6
|
[Update] 修改api
|
2018-07-17 12:06:47 +08:00 |
老广
|
1a49cf4d9c
|
Merge pull request #1532 from wojiushixiaobai/dev
[Update]修改url地址
|
2018-07-16 22:24:09 -05:00 |
ibuler
|
4d1da56872
|
[Update] 修改asset api
|
2018-07-16 14:47:06 +08:00 |
老广
|
ff9e109a2c
|
Merge pull request #1533 from jumpserver/update_unblockuser
[Update] 取消系统用户-清除认证信息,取消-网关rdp协议认证信息,添加解除用户登录限制功能
|
2018-07-16 01:42:30 -05:00 |
BaiJiangJie
|
09e636495e
|
[Update] 模版删除unblock的id属性
|
2018-07-16 12:22:32 +08:00 |
BaiJiangJie
|
14076d8fe1
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
|
2018-07-16 12:13:59 +08:00 |
BaiJiangJie
|
812078331e
|
[Update] 添加解除用户登录限制功能
|
2018-07-16 12:13:13 +08:00 |
wojiushixiaobai
|
696589a3cf
|
修改url
|
2018-07-16 12:13:06 +08:00 |
wojiushixiaobai
|
7eba46b303
|
Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
|
2018-07-16 11:01:49 +08:00 |
wojiushixiaobai
|
5d63d2369f
|
合并冲突解决
|
2018-07-16 11:01:06 +08:00 |
ibuler
|
3e17e94245
|
[Update] 修改资产
|
2018-07-15 18:39:11 +08:00 |
ibuler
|
5648dcd7e7
|
[Update] 修改用户view
|
2018-07-15 00:55:05 +08:00 |
ibuler
|
28e47f33c1
|
[Update] 修改一些逻辑
|
2018-07-14 00:47:21 +08:00 |
老广
|
91b3b7ce69
|
Merge pull request #1515 from wstart/master
授权页面分页问题
|
2018-07-13 08:22:34 -05:00 |
老广
|
8c587a1376
|
Merge pull request #1523 from wojiushixiaobai/dev
[Update]修改url地址
|
2018-07-13 08:19:40 -05:00 |
BaiJiangJie
|
1182313c1a
|
[Update] 取消系统用户-清除认证信息,取消-网关rdp协议认证信息,添加用户unblock功能
|
2018-07-13 19:30:48 +08:00 |
ibuler
|
7412bdcba7
|
[Update] 完成基本框架
|
2018-07-13 15:05:46 +08:00 |
ibuler
|
d6ec92d82d
|
[Update] 修改url
|
2018-07-13 00:31:50 +08:00 |
ibuler
|
ad3214641d
|
[Update] 添加org
|
2018-07-13 00:00:35 +08:00 |
wojiushixiaobai
|
9004351ad1
|
修正字符串
|
2018-07-12 16:47:35 +08:00 |
wojiushixiaobai
|
d3e22a2a90
|
修改url地址
|
2018-07-12 10:53:39 +08:00 |
wstart
|
fd3df81a64
|
Update api.py
|
2018-07-10 17:03:31 +08:00 |
ycfuck
|
72517a2c72
|
授权页面分页
授权页面分页
|
2018-07-10 16:33:28 +08:00 |
ibuler
|
01185a2d07
|
[Update] 添加gateway api
|
2018-07-10 16:03:05 +08:00 |
ibuler
|
8bfd2be21f
|
[Update] 清除系统用户认证信息时提示
|
2018-07-10 15:50:15 +08:00 |
老广
|
b03ac46df9
|
Merge pull request #1456 from wojiushixiaobai/dev
[Update]修改提示文字
|
2018-07-10 02:35:26 -05:00 |
老广
|
76be054fcb
|
Merge pull request #1502 from Nevss/patch-1
update docker-guacamole version to latest
|
2018-07-10 02:32:06 -05:00 |