github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
3,013 Commits
72 Branches
250 Tags
115 MiB
Commit Graph

3013 Commits (59eb1f8e3e9f868bf79db56204fa9c758a58f9f8)

Author SHA1 Message Date
老广 59eb1f8e3e
Merge pull request #1265 from jumpserver/bufix_for_perm_tree 
[Bugfix] 修复授权树列表和资产树列表不同的bug
 2018-04-26 19:53:39 +08:00
ibuler 16aa42a861 [Bugfix] 修复授权树列表和资产树列表不同的bug 2018-04-26 19:51:32 +08:00
ibuler d5debc375e [Bugfix] 修复命令搜索异常bug 2018-04-25 17:48:44 +08:00
ibuler 40a0c4597b Merge remote-tracking branch 'github/dev' into dev 2018-04-25 15:15:36 +08:00
BaiJiangjie ea2863a51b [Update] 创建用户、资产成功的提示信息可关闭 2018-04-24 22:10:52 +08:00
BaiJiangjie 102e1ca97c [Bugfix] 创建资产，资产系统置上，RDP:3389 2018-04-24 18:29:14 +08:00
BaiJiangjie 2823d02763 [Bugfix] 修复资产列表导入，资产id问题 2018-04-24 16:15:04 +08:00
BaiJiangjie c37414045b [Bugfix] 修改用户列表导出，默认导出全部用户 2018-04-24 15:16:05 +08:00
BaiJiangjie 784bec42ff [Update] 修改用户登录,首次登录不需要验证码,登录失败时需要验证码校验 2018-04-24 13:00:36 +08:00
ibuler 9a3d0732bc [Update] 更新授权代码 2018-04-24 11:07:09 +08:00
ibuler 20a7247b16 Merge remote-tracking branch 'github/dev' into dev 2018-04-24 10:52:31 +08:00
ibuler df60981eb4 Merge branch 'dev' of bitbucket.org:jumpserver/core into dev 2018-04-24 10:51:30 +08:00
老广 7aa2bb06e8
Merge pull request #1228 from wojiushixiaobai/dev 
添加升级脚本
 2018-04-24 10:41:23 +08:00
liuzheng712 536be1175a
feat: replay api update 
make a v2 session replay api, get the json response
 2018-04-24 08:53:30 +08:00
BaiJiangjie b5fc76d6a5 [Update] 修改用户首次登录页 2018-04-23 21:04:46 +08:00
ibuler 941dd627e3 [Update] 更新session列表 2018-04-23 11:44:09 +08:00
ibuler 8389c85054 [Update] 更改sesion表结构 2018-04-23 11:40:30 +08:00
ibuler 02ca8c3139 [Update] 更新session api 2018-04-23 11:32:46 +08:00
wojiushixiaobai abd20f31b8 更新升级脚本 2018-04-22 22:37:51 +08:00
wojiushixiaobai 5c7acae018 更改版本号 2018-04-22 20:18:10 +08:00
wojiushixiaobai 1c623f71e0 添加升级脚本 2018-04-22 19:22:55 +08:00
BaiJiangjie 5b52b907c0 [Update] 创建用户，更新用户，添加MFA设置选项 2018-04-20 16:15:45 +08:00
BaiJiangjie 8447c6f487 [Update] 修改coco文案OTP改为MFA 2018-04-20 11:51:32 +08:00
BaiJiangjie ad6e22cd42 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2018-04-20 11:24:21 +08:00
BaiJiangjie 7a219e1710 [Update] OTP文案修改为MFA 2018-04-20 11:23:31 +08:00
ibuler 0c24310510 [Bugfix] 修复用户错误storage的bug 2018-04-19 18:26:59 +08:00
ibuler 9ac7f26c74 [Update] 修改用户详情，自己更改自己otp，提示小写 2018-04-19 17:55:40 +08:00
BaiJiangjie f73fe1f315 [Bugfix] 修复用户登录缓存设置问题 2018-04-19 17:20:53 +08:00
ibuler 763cf0d981 [Bugfix] 修复解密None的bug 2018-04-19 16:35:38 +08:00
ibuler 95a8bf0988 Merge remote-tracking branch 'github/dev' into dev 2018-04-19 11:46:07 +08:00
ibuler 947f7d206a [Bugfix] 修复生成system user的问题 2018-04-19 11:16:52 +08:00
BaiJiangjie 12c8cf6b76 [Update] 添加OTP认证功能 2018-04-19 11:13:11 +08:00
BaiJiangjie 33bc73aba7 [Update] 添加OTP认证功能 2018-04-19 10:49:47 +08:00
ibuler 035dd16b36 [Bugfix] 修复授权详情中选择用户或资产的bug 2018-04-19 10:34:17 +08:00
BaiJiangjie f450accbf8 [Merge] with dev 2018-04-18 12:49:17 +08:00
BaiJiangjie 0bbfc7433d [Feature] 支持otp 2018-04-18 12:48:07 +08:00
ibuler 48e8785725 [Update] 修改users otp secret key 2018-04-18 12:46:25 +08:00
ibuler b90d3306c5 [Bugfix] 去掉gateway name连接 2018-04-17 12:01:00 +08:00
ibuler 7f7d634c38 Merge remote-tracking branch 'github/master' into dev 2018-04-16 17:08:01 +08:00
老广 45b13abed3
Merge pull request #1204 from jumpserver/bugfix_user_assets 
[Bugfix] 修复用户看不到我的资产的bug
 2018-04-16 17:04:29 +08:00
ibuler 72cd7a3be2 [Bugfix] 修复用户看不到我的资产的bug 2018-04-16 17:01:25 +08:00
ibuler 3ccd54680e [Bugfix] 修改授权详情快速Node更改失效的bug 2018-04-14 12:18:15 +08:00
ibuler 071d14c639 [Update] 修改资产获取select 2018-04-13 21:26:10 +08:00
ibuler 823e879432 [Update] 更新节点移动交互 2018-04-13 15:48:10 +08:00
ibuler 739932b005 [Update] 更新资产导入 2018-04-12 18:50:43 +08:00
ibuler 24f144fdc3 [Bugfix] 修复导入资产时url地址问题 2018-04-12 18:17:42 +08:00
ibuler 967800391e [Update] 更新api 2018-04-12 17:31:37 +08:00
老广 3ccb6637d7
Merge pull request #1197 from jumpserver/dev 
[Update] 更新迁移脚本
 2018-04-12 17:03:39 +08:00
ibuler 8dfdefd428 [Update] 更新迁移脚本 2018-04-12 17:02:04 +08:00
老广 ab2c58b626
Merge pull request #1194 from jumpserver/dev 
[Bugfix] 修复资产重复的bug
 2018-04-12 11:08:14 +08:00