Commit Graph

5157 Commits (85699106581e473aff0e43f516f31ba37d5c7e1d)
 

Author SHA1 Message Date
BaiJiangJie 52c6244b2b
Merge pull request #3842 from jumpserver/dev
5 years ago
BaiJiangJie 7977294c5c
Merge pull request #3841 from jumpserver/dev
5 years ago
BaiJiangJie e1331084e5
Merge pull request #3840 from jumpserver/dev_readme
5 years ago
Michael Bai 5268c0faae [Update] OpenID登录成功后,如果用户没有email字段则构造默认的email
5 years ago
Michael Bai b2d9b69874 [Update] 修改readme
5 years ago
BaiJiangJie 336589af98
Merge pull request #3836 from jumpserver/1.5.8_cap
5 years ago
Bai 5087c0e06f Merge branch 'dev' into 1.5.8_cap
5 years ago
BaiJiangJie 43ecd39d0e
Merge pull request #3835 from jumpserver/dev
5 years ago
BaiJiangJie 209b23c5ce
Merge pull request #3834 from jumpserver/dev_req
5 years ago
Bai 7e7d4401e6 [Update] 修改依赖jms-storage==0.0.28
5 years ago
BaiJiangJie b4c3471d2c
Merge pull request #3833 from jumpserver/dev
5 years ago
BaiJiangJie f4a822062f
Merge pull request #3829 from jumpserver/dev_bai
5 years ago
Bai 4583beaec0 [Update] 创建AuthBook对象的方法从ModelManager中移动到Model中,保留原生的对象create方法;同时添加事务处理;
5 years ago
BaiJiangJie 42a6feb35e
Merge pull request #3822 from jumpserver/dev_lock
5 years ago
Bai 4503df910d [Update] 优化创建AuthBook逻辑;添加锁机制(基于redis-lock);
5 years ago
BaiJiangJie a09b0c6c06
Merge pull request #3818 from jumpserver/dev_bai
5 years ago
Michael Bai 55c7e06185 [Update] 修改任务执行日期显示本地时间
5 years ago
老广 a95a0da6f7
Merge pull request #3816 from jumpserver/dev
5 years ago
ibuler 0fd43f48f0 [Bugfix] 修复因数据不支持timezone引起的仪表盘数据为空的bug
5 years ago
ibuler dffd05cd20 [Update] 修改组织获取优先级
5 years ago
BaiJiangJie 681046119d
Merge pull request #3811 from jumpserver/dev
5 years ago
BaiJiangJie b19c49da41
Merge pull request #3810 from jumpserver/dev_bai
5 years ago
Michael Bai cc31c04b5f [Update] 升级依赖
5 years ago
Michael Bai 89f62d8e6b [Update] 更新翻译
5 years ago
Michael Bai 41b73c3701 [Update] 修改提示播放器下载地址
5 years ago
BaiJiangJie cff3a790ef
Merge pull request #3809 from jumpserver/dev_bai
5 years ago
Michael Bai 8328edd69c [Update] 修改Node generate fake时死循环的问题
5 years ago
ibuler 9bf5d6dd45 [Update] 用户profile中添加orgs
5 years ago
BaiJiangJie ac9a0c6d26
Merge pull request #3803 from jumpserver/dev
5 years ago
ibuler 064cb16d25 [Update] 禁用ansible连接复用
5 years ago
BaiJiangJie f89b1fd44b
Merge pull request #3798 from jumpserver/dev
5 years ago
ibuler b25096925b [Bugfix] 修复重置并下载ssh key的bug
5 years ago
BaiJiangJie e8ff576324
Merge pull request #3797 from jumpserver/dev
5 years ago
ibuler 5ac1467564 [Update] 修复收藏数量不对的问题
5 years ago
BaiJiangJie 1c54e5acd8
Merge pull request #3796 from jumpserver/dev
5 years ago
ibuler b8d0272e37 [Update] 修改测试系统用户显示
5 years ago
ibuler 0b7a90b83c Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 7cf000262d [Update] django cas ng 退出逻辑有问题,暂时屏蔽
5 years ago
BaiJiangJie fa7e0d84f9
Merge pull request #3794 from jumpserver/dev_bai
5 years ago
Bai 98f6d0146c [Update] 修改批量移除节点时不选择节点给出提示信息
5 years ago
ibuler d0fac3f838 [Bugfix] 修复task 列表、
5 years ago
ibuler a41988d2b5 [Bugfix] 修改配置文件,支持cas proxy
5 years ago
BaiJiangJie b801d2f2e9
Update README.md
5 years ago
BaiJiangJie 6bed9210dd
Merge pull request #3793 from jumpserver/dev_bai
5 years ago
Bai eac4630272 [Update] 修改readme2
5 years ago
BaiJiangJie 11a0d72b01
Merge pull request #3792 from jumpserver/dev_readme
5 years ago
Bai 7dcd04ca1a [Update] 修改readme
5 years ago
BaiJiangJie ccfb151fb1
Merge pull request #3791 from jumpserver/dev_version
5 years ago
Bai ae98eee0c7 [Update] 更新版本号
5 years ago
BaiJiangJie 829a4406a2
Merge pull request #3790 from jumpserver/dev_bai
5 years ago