github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
2,990 Commits
64 Branches
246 Tags
104 MiB
Commit Graph

2990 Commits (ad6e22cd4292bce94ce9af982594817e6a6480e5)

Author SHA1 Message Date
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
ibuler ee4f5a8194 [Bugfix] 修复资产重复的bug 2018-04-12 11:07:40 +08:00
老广 084a76b215
Merge pull request #1193 from jumpserver/dev 
更改表结构
 2018-04-12 10:17:53 +08:00
ibuler 2398e9acbd 更改表截稿 2018-04-12 10:16:38 +08:00
老广 5ad8b3cc70
Merge pull request #1191 from jumpserver/dev 
[Update] 更改版本号
 2018-04-12 09:51:54 +08:00
ibuler 7d14e1f248 [Update] 更改版本号 2018-04-12 09:49:44 +08:00
老广 819f8f469d
Merge pull request #1187 from jumpserver/dev 
[Bugfix] 修复一个脚本的bug
 2018-04-11 17:02:02 +08:00
ibuler a31b7a8800 [Update] 2018-04-11 16:59:07 +08:00
老广 24bdaecab4
Merge pull request #1185 from jumpserver/dev 
授权规则优化，支持细颗粒授权
 2018-04-11 15:25:02 +08:00
ibuler 8b3b517bab [Update] 修改授权规则详情列表页面 2018-04-11 15:24:12 +08:00
ibuler 7fc2ef00ee [Update] 修改资产api获取的bug 2018-04-11 12:45:04 +08:00
ibuler cbd6c3ee69 [Update] 添加迁移脚本 2018-04-11 12:23:35 +08:00
ibuler 3835adafb8 [Update] 修改bug 2018-04-11 12:13:49 +08:00
ibuler bbaa35c773 [Update] 修改Perms 2018-04-11 11:34:15 +08:00
ibuler 0fa8287811 Merge branch 'dev' into perms 2018-04-11 10:25:18 +08:00
ibuler 78f4e5a89a [Update] 修改用户Opt 2018-04-10 21:04:56 +08:00
ibuler 3193c5549d Merge remote-tracking branch 'github/dev' into dev 2018-04-10 21:02:36 +08:00
ibuler ed71e7d2d9 [Update] 修改用户Opt 2018-04-10 21:02:07 +08:00
ibuler 33c299566a [Update] 修复bug 2018-04-10 20:45:01 +08:00
ibuler 84634eb8c0 [Update] 修改Permr认证 2018-04-10 20:29:06 +08:00
ibuler a4ff2181c5 [Update] 修改用户view的api 2018-04-10 09:41:06 +08:00
ibuler fffa0def9e [Update] 修改api和view 2018-04-08 20:02:40 +08:00
ibuler d0ede246e7 [Update] 修改授权 2018-04-08 00:16:37 +08:00
BaiJiangJie b8b78ffeb2
Merge pull request #1162 from BaiJiangJie/dev 
创建用户发送邮件
 2018-04-06 15:50:50 +08:00