github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
5,130 Commits
70 Branches
249 Tags
114 MiB
Commit Graph

5130 Commits (b1f5cc7728a9cf7c0e5484eb63fa927f7a948af0)

Author SHA1 Message Date
Bai d1d73da322 [Update] Merge from dev 2020-04-10 14:46:35 +08:00
BaiJiangJie 88fcf8dbd7
Merge pull request #3869 from jumpserver/lina_user 
[Update] 修改用户Profile序列类返回的admin_orgs
 2020-04-10 12:49:57 +08:00
Bai 396bc9b6ae [Update] 修改用户ViewSet序列类返回的admin_orgs（解决组织管理员登录的Bug) 2020-04-10 12:47:16 +08:00
BaiJiangJie 27ffed1be9
Merge pull request #3868 from jumpserver/dev_user 
[Update] 修改用户ViewSet序列类返回的admin_orgs（解决组织管理员登录的Bug)
 2020-04-10 12:40:12 +08:00
Bai af9d42695f [Update] 修改用户ViewSet序列类返回的admin_orgs（解决组织管理员登录的Bug) 2020-04-10 12:38:05 +08:00
BaiJiangJie 422b4424fe
Merge pull request #3867 from jumpserver/dev_ab 
[Update] 修复AuthBook删除失败的Bug
 2020-04-09 23:40:18 +08:00
Michael Bai dc172e1ef0 [Update] 修复AuthBook删除失败的Bug 2020-04-09 23:39:17 +08:00
ibuler cd7946f3f0 [Update] 修改一些bug 2020-04-09 18:58:22 +08:00
BaiJiangJie 4994a4a387
Dev bai (#3865) 
* [Update] 更新config-example（CAS)

* [Update] 更新config-example（CAS)2

* [Update] 更新config-example（CAS)3
 2020-04-09 13:39:11 +08:00
BaiJiangJie e26eba9919
Merge pull request #3864 from jumpserver/1.5.8 
1.5.8
 2020-04-09 11:36:38 +08:00
Bai 44cd82f3e1 [Update] 修改翻译 2020-04-09 10:59:00 +08:00
Bai adf14b0f2e [Update] 修改版本号 2020-04-09 10:46:24 +08:00
Bai f5a7c4131d [Update] 修改校验join session的url-name 2020-04-09 10:43:25 +08:00
ibuler e7031d0ac1 [Update] 修改serailizer mixin 2020-04-09 10:33:20 +08:00
Bai ef27188f86 [Update] 修改Bug: CommandViewSet的Option方法Error 2020-04-08 18:08:22 +08:00
BaiJiangJie a7734812fc
Merge pull request #3860 from jumpserver/1.5.8_bai 
[Update] 命令记录导出: 只导出满足搜索条件的数据
 2020-04-08 01:35:16 +08:00
Michael Bai fb62fbde6c [Update] 命令记录导出: 只导出满足搜索条件的数据 2020-04-08 01:34:10 +08:00
BaiJiangJie 521f4ea86b
Merge pull request #3857 from jumpserver/1.5.8_bai 
1.5.8 bai
 2020-04-07 12:32:54 +08:00
Bai e9827c8b25 [Update] 添加会话加入校验API 2020-04-07 12:26:47 +08:00
Bai 29b099efc0 [Update] 添加加入会话按钮 2020-04-02 19:45:56 +08:00
Bai e9fc56c056 [Update] 修改日志日期显示问题 2020-04-02 16:02:55 +08:00
Bai e9103ee608 [Update] 对自定义MetaDict字段值进行strip 2020-04-02 15:14:30 +08:00
ibuler f8dae2a3c9 [Update] 时区允许设置 2020-04-01 17:27:32 +08:00
BaiJiangJie 52c6244b2b
Merge pull request #3842 from jumpserver/dev 
Dev
 2020-03-28 21:36:54 +08:00
BaiJiangJie 7977294c5c
Merge pull request #3841 from jumpserver/dev 
Dev
 2020-03-28 21:36:09 +08:00
BaiJiangJie e1331084e5
Merge pull request #3840 from jumpserver/dev_readme 
Dev readme
 2020-03-28 21:35:23 +08:00
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