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

5554 Commits (7ea2a0d6a5ad79101dd9a6238f87a949e5f6cbc5)

Author SHA1 Message Date
Michael Bai 5268c0faae [Update] OpenID登录成功后，如果用户没有email字段则构造默认的email 2020-03-28 21:34:17 +08:00
Michael Bai b2d9b69874 [Update] 修改readme 2020-03-28 21:26:27 +08:00
BaiJiangJie 336589af98
Merge pull request #3836 from jumpserver/1.5.8_cap 
1.5.8 cap
 2020-03-27 11:28:39 +08:00
Bai 5087c0e06f Merge branch 'dev' into 1.5.8_cap 2020-03-27 11:26:09 +08:00
BaiJiangJie 43ecd39d0e
Merge pull request #3835 from jumpserver/dev 
Dev
 2020-03-27 11:09:09 +08:00
BaiJiangJie 209b23c5ce
Merge pull request #3834 from jumpserver/dev_req 
[Update] 修改依赖jms-storage==0.0.28
 2020-03-27 11:08:42 +08:00
Bai 7e7d4401e6 [Update] 修改依赖jms-storage==0.0.28 2020-03-27 11:07:55 +08:00
BaiJiangJie b4c3471d2c
Merge pull request #3833 from jumpserver/dev 
Dev
 2020-03-27 10:48:09 +08:00
BaiJiangJie f4a822062f
Merge pull request #3829 from jumpserver/dev_bai 
[Update] 优化创建AuthBook对象
 2020-03-26 13:13:35 +08:00
Bai 4583beaec0 [Update] 创建AuthBook对象的方法从ModelManager中移动到Model中，保留原生的对象create方法；同时添加事务处理； 2020-03-26 13:11:38 +08:00
BaiJiangJie 42a6feb35e
Merge pull request #3822 from jumpserver/dev_lock 
[Update] 优化创建AuthBook逻辑；添加锁机制(基于redis-lock)；
 2020-03-24 23:20:38 +08:00
Bai 4503df910d [Update] 优化创建AuthBook逻辑；添加锁机制(基于redis-lock)； 2020-03-24 18:40:20 +08:00
BaiJiangJie a09b0c6c06
Merge pull request #3818 from jumpserver/dev_bai 
[Update] 修改任务执行日期显示本地时间
 2020-03-24 08:57:45 +08:00
Michael Bai 55c7e06185 [Update] 修改任务执行日期显示本地时间 2020-03-24 01:37:09 +08:00
老广 a95a0da6f7
Merge pull request #3816 from jumpserver/dev 
[Bugfix] 修复因数据不支持timezone引起的仪表盘数据为空的bug
 2020-03-23 17:56:45 +08:00
ibuler 0fd43f48f0 [Bugfix] 修复因数据不支持timezone引起的仪表盘数据为空的bug 2020-03-23 17:55:28 +08:00
ibuler dffd05cd20 [Update] 修改组织获取优先级 2020-03-23 10:52:26 +08:00
BaiJiangJie 681046119d
Merge pull request #3811 from jumpserver/dev 
Dev
 2020-03-23 03:22:00 +08:00
BaiJiangJie b19c49da41
Merge pull request #3810 from jumpserver/dev_bai 
[Update] 修改翻译；升级依赖；
 2020-03-23 03:20:30 +08:00
Michael Bai cc31c04b5f [Update] 升级依赖 2020-03-23 03:15:51 +08:00
Michael Bai 89f62d8e6b [Update] 更新翻译 2020-03-23 03:06:53 +08:00
Michael Bai 41b73c3701 [Update] 修改提示播放器下载地址 2020-03-23 03:02:22 +08:00
BaiJiangJie cff3a790ef
Merge pull request #3809 from jumpserver/dev_bai 
[Update] 修改Node generate fake时死循环的问题
 2020-03-23 02:50:06 +08:00
Michael Bai 8328edd69c [Update] 修改Node generate fake时死循环的问题 2020-03-23 02:32:24 +08:00
ibuler 9bf5d6dd45 [Update] 用户profile中添加orgs 2020-03-20 18:21:27 +08:00
BaiJiangJie ac9a0c6d26
Merge pull request #3803 from jumpserver/dev 
[Update] 禁用ansible连接复用
 2020-03-20 17:55:38 +08:00
ibuler 064cb16d25 [Update] 禁用ansible连接复用 2020-03-20 16:45:38 +08:00
BaiJiangJie f89b1fd44b
Merge pull request #3798 from jumpserver/dev 
[Bugfix] 修复重置并下载ssh key的bug
 2020-03-19 16:28:34 +08:00
ibuler b25096925b [Bugfix] 修复重置并下载ssh key的bug 2020-03-19 16:28:08 +08:00
BaiJiangJie e8ff576324
Merge pull request #3797 from jumpserver/dev 
[Update] 修复收藏资产数量不对的问题
 2020-03-19 15:43:44 +08:00
ibuler 5ac1467564 [Update] 修复收藏数量不对的问题 2020-03-19 15:41:41 +08:00
BaiJiangJie 1c54e5acd8
Merge pull request #3796 from jumpserver/dev 
Dev
 2020-03-19 14:26:23 +08:00
ibuler b8d0272e37 [Update] 修改测试系统用户显示 2020-03-19 11:47:39 +08:00
ibuler 0b7a90b83c Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-03-19 11:13:34 +08:00
ibuler 7cf000262d [Update] django cas ng 退出逻辑有问题，暂时屏蔽 2020-03-19 11:11:18 +08:00
BaiJiangJie fa7e0d84f9
Merge pull request #3794 from jumpserver/dev_bai 
[Update] 修改批量移除节点时不选择节点给出提示信息
 2020-03-19 10:27:26 +08:00
Bai 98f6d0146c [Update] 修改批量移除节点时不选择节点给出提示信息 2020-03-19 10:21:19 +08:00
ibuler d0fac3f838 [Bugfix] 修复task 列表、 2020-03-18 19:58:08 +08:00
ibuler a41988d2b5 [Bugfix] 修改配置文件，支持cas proxy 2020-03-18 19:10:27 +08:00
BaiJiangJie b801d2f2e9
Update README.md 2020-03-18 17:16:53 +08:00
BaiJiangJie 6bed9210dd
Merge pull request #3793 from jumpserver/dev_bai 
[Update] 修改readme2
 2020-03-18 17:15:15 +08:00
Bai eac4630272 [Update] 修改readme2 2020-03-18 17:14:21 +08:00
BaiJiangJie 11a0d72b01
Merge pull request #3792 from jumpserver/dev_readme 
[Update] 修改readme
 2020-03-18 17:09:21 +08:00
Bai 7dcd04ca1a [Update] 修改readme 2020-03-18 17:03:49 +08:00
BaiJiangJie ccfb151fb1
Merge pull request #3791 from jumpserver/dev_version 
[Update] 更新版本号
 2020-03-18 16:43:12 +08:00
Bai ae98eee0c7 [Update] 更新版本号 2020-03-18 16:34:37 +08:00
BaiJiangJie 829a4406a2
Merge pull request #3790 from jumpserver/dev_bai 
[Update] 修改执行task时切换root组织2
 2020-03-18 14:04:14 +08:00
Bai 91c42e8530 [Update] 修改执行task时切换root组织2 2020-03-18 14:02:36 +08:00
BaiJiangJie 250acea751
Merge pull request #3789 from jumpserver/dev_bai 
[Update] 修改执行task时切换root组织
 2020-03-18 13:49:04 +08:00
Bai 00d9f71384 [Update] 修改执行task时切换root组织 2020-03-18 13:45:49 +08:00