github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
3,785 Commits
96 Branches
262 Tags
144 MiB
Commit Graph

3785 Commits (0a5fdf4ea170e22a7b7892b715a38faa3bcf868c)

Author SHA1 Message Date
老广 55096f9ad5
Bugfix perm asset not active (#1273) 
* [Bugfix] 修复资产禁用了还可以登录的bug
 2018-04-27 11:41:47 +08:00
老广 494cd760d7
Trans change (#1272) 
* [Update] 更新授权规则生效日期文案
 2018-04-27 11:33:28 +08:00
老广 6f494ef09c
校验用户名长度和特殊字符 (#1271) 
* [Bugfix] 修复系统用户用户名校验问题

* [Update] 增加长度限制
 2018-04-27 11:27:16 +08:00
wojiushixiaobai e476cab2a1 更新自动升级脚本 (#1250) 2018-04-27 11:01:52 +08:00
老广 cc67fcb53b
Merge pull request #1269 from jumpserver/dev 
Dev
 2018-04-26 21:02:00 +08:00
老广 b074bd8fbd
Merge pull request #1267 from jumpserver/bugfix_user 
[Bugfix] 修复首次登录条款问题及引导页面MFA配置问题
 2018-04-26 21:00:20 +08:00
老广 627582233b
Merge pull request #1268 from jumpserver/bufix_for_perm_tree 
[Bugfix] 解决上次引入的bug
 2018-04-26 20:59:05 +08:00
ibuler 5103dab72e [Bugfix] 解决上次引入的bug 2018-04-26 20:48:32 +08:00
老广 43c13355f2
Merge pull request #1266 from jumpserver/dev 
Dev
 2018-04-26 19:54:42 +08:00
老广 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
BaiJiangjie 0962a16b22 [Bugfix] 修复首次登录条款问题及引导页面MFA配置问题 2018-04-26 19:49:09 +08:00
wojiushixiaobai 7c35e75586 更新自动升级脚本 2018-04-25 19:49:22 +08:00
老广 787be3ff7a
Merge pull request #1248 from jumpserver/dev 
Bugfix 修复搜索命令的bug
 2018-04-25 17:55:39 +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
老广 5c17b1a7f7
Merge pull request #1240 from jumpserver/dev 
首次登陆免验证码，首次登录信息变更
 2018-04-25 10:00:56 +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
老广 e865484a56
Merge pull request #1224 from jumpserver/dev 
Dev
 2018-04-20 11:36:16 +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
老广 a0a8419c5e
Merge pull request #1221 from jumpserver/dev 
[Bugfix] 修复用户错误storage的bug
 2018-04-19 18:27:49 +08:00
ibuler 0c24310510 [Bugfix] 修复用户错误storage的bug 2018-04-19 18:26:59 +08:00
老广 967491fba5
Merge pull request #1220 from jumpserver/dev 
[Update] 修改用户详情，自己更改自己otp，提示小写
 2018-04-19 17:56:41 +08:00
ibuler 9ac7f26c74 [Update] 修改用户详情，自己更改自己otp，提示小写 2018-04-19 17:55:40 +08:00
老广 910f3cdddc
Merge pull request #1219 from jumpserver/dev 
[Bugfix] 修复用户登录缓存设置问题
 2018-04-19 17:22:04 +08:00
BaiJiangjie f73fe1f315 [Bugfix] 修复用户登录缓存设置问题 2018-04-19 17:20:53 +08:00
老广 28acc6cc63
Merge pull request #1217 from jumpserver/dev 
[Bugfix] 修复解密None的bug
 2018-04-19 16:39:27 +08:00
ibuler 763cf0d981 [Bugfix] 修复解密None的bug 2018-04-19 16:35:38 +08:00
老广 611289a5ec
Merge pull request #1214 from jumpserver/dev 
支持二次认证
 2018-04-19 12:16:25 +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