github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-01 09:12:09 +00:00
Code Issues Projects Releases Wiki Activity
4,826 Commits 82 Branches 258 Tags 139 MiB
cff3a790ef
Commit Graph

4826 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
064cb16d25 [Update] 禁用ansible连接复用 2020-03-20 16:45:38 +08:00
ibuler
b25096925b [Bugfix] 修复重置并下载ssh key的bug 2020-03-19 16:28:08 +08:00
ibuler
5ac1467564 [Update] 修复收藏数量不对的问题 2020-03-19 15:41:41 +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
BaiJiangJie
ffce909ee3
Merge pull request #3783 from jumpserver/bugfix 
Bugfix
 2020-03-18 11:05:51 +08:00
BaiJiangJie
0e62ea787c
Merge pull request #3785 from jumpserver/login_image_2 
[Fix] 修改登录图片亮度
 2020-03-18 10:44:55 +08:00
jym503558564
cedb862420 [Fix] 修改登录图片亮度 2020-03-17 17:28:53 +08:00
Bai
a6054ff6a5 [Update] 修复批量删除资产，当待删除数量和资产总数相等时，提示删除失败。 2020-03-17 17:06:59 +08:00
Bai
a67b445026 [Update] 修复录像存储ceph的help_text 2020-03-17 16:15:37 +08:00
BaiJiangJie
8d33990050
Merge pull request #3782 from jumpserver/login_image_2 
[Fix] 修改登录界面LOGO
 2020-03-17 15:32:18 +08:00
jym503558564
516e75cbf4 [Fix] 修改登录界面LOGO 2020-03-17 15:30:59 +08:00
Bai
15ca775005 [Update] 删除推送系统用户时关于task的log 2020-03-17 15:21:12 +08:00
Bai
41ca43bf33 Merge branch 'bugfix' of https://github.com/jumpserver/jumpserver into bugfix 2020-03-17 15:02:56 +08:00
Bai
c6a604fd5f [Update] 修复显示创建者字段值的问题 2020-03-17 15:02:44 +08:00
ibuler
8e84efb296 [Update] 修改一些文案和翻译 2020-03-17 13:51:41 +08:00
ibuler
caee286973 [Update] 修改华为云始终有效的bug 2020-03-17 10:59:49 +08:00
ibuler
672b82c3d6 [Bugfix] 修复可能无法找到command execution的bug 2020-03-16 19:24:48 +08:00
ibuler
55554a025f [Bugfix] 修复动态系统用户更新用户时无法推送的bug, 修复通过relation api无法触发m2m_change的bug 2020-03-16 19:15:29 +08:00
ibuler
c91ce2b99f [Bugfix] 修复动态系统用户返回auth info的bug 2020-03-16 16:59:45 +08:00
ibuler
02a901467b [Bugfix] 修复动态系统用户登录windows的bug 2020-03-16 16:13:54 +08:00
ibuler
00b3c7c945 [Bugfix] 修复动态系统用户执行批量命令的bug 2020-03-16 15:23:15 +08:00
ibuler
2f9598ba49 [Update] 修复ops task中任务某版本任务的bug 2020-03-16 14:41:24 +08:00
ibuler
3138abb00c [Bugfix] 修复ops列表任务无法删除的bug 2020-03-16 14:18:29 +08:00
ibuler
3afb8647bd Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-03-13 13:57:42 +08:00
ibuler
0682f4fc90 [Update] 修改readme 2020-03-13 13:57:21 +08:00
BaiJiangJie
44ec69fdbd
Merge pull request #3775 from jumpserver/dev_bai 
[Update] 修改只有local用户需要发送创建成功邮件、发送密码过期邮件；
 2020-03-13 12:36:40 +08:00
Bai
04945809a5 [Update] 修改只有local用户需要发送创建成功邮件、发送密码过期邮件； 2020-03-13 12:33:09 +08:00
BaiJiangJie
e38b113d7e
Merge pull request #3771 from jumpserver/dev_trans 
[Update] 更新翻译
 2020-03-12 19:05:50 +08:00
Bai
eb448dc3f2 [Update] 更新翻译 2020-03-12 19:00:22 +08:00
BaiJiangJie
954a97bba7
Merge pull request #3770 from jumpserver/dev_req 
[Update] 更新依赖jms-storage=0.0.27
 2020-03-12 16:34:33 +08:00
Bai
41e03c629f [Update] 更新依赖jms-storage=0.0.27 2020-03-12 16:33:33 +08:00