github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-07 03:49:00 +00:00
Code Issues Projects Releases Wiki Activity
5,787 Commits 87 Branches 258 Tags 140 MiB
e599bca951
Commit Graph

5787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BaiJiangJie
a07a90f1c9 [Update] 修改用户详情中审批人设置显示条件 2019-12-04 16:59:57 +08:00
BaiJiangJie
64642ab48b
Merge pull request #3492 from jumpserver/dev 
Dev
 2019-12-04 15:49:02 +08:00
BaiJiangJie
12f51c9474
Merge pull request #3491 from jumpserver/dev_v 
[Update] 修改版本号（1.5.5）
 2019-12-04 15:24:49 +08:00
BaiJiangJie
50106474d4 [Update] 修改版本号（1.5.5） 2019-12-04 15:22:18 +08:00
BaiJiangJie
b3e2b30e71
Merge pull request #3488 from jumpserver/1.5.5 
1.5.5
 2019-12-04 12:33:03 +08:00
BaiJiangJie
7427f02e0b
Merge pull request #3489 from jumpserver/bai_1.5.5 
1.5.5（Merge dev）
 2019-12-04 12:24:03 +08:00
BaiJiangJie
330c078597 [Update] Merge dev 2019-12-04 12:22:09 +08:00
BaiJiangJie
eb05588776
Merge pull request #3486 from jumpserver/dev 
Dev
 2019-12-04 11:14:43 +08:00
BaiJiangJie
98d3a36d98
Merge pull request #3485 from jumpserver/task_search 
[Update] 修复任务列表页面无法搜索问题
 2019-12-04 10:42:38 +08:00
jym503558564
fedf50f9dc [Update] 修复任务列表页面无法搜索问题 2019-12-03 15:31:42 +08:00
BaiJiangJie
1876b7dfba
Merge pull request #3483 from jumpserver/gateway_search 
[Update] 修复网关搜索报500错误；密码为空时，测试连接报500错误
 2019-12-03 12:07:20 +08:00
BaiJiangJie
873d909879
Merge pull request #3449 from jumpserver/user_detail_template 
[Update] 修改用户详情页中用户组标签不显示的问题
 2019-12-03 12:06:32 +08:00
jym503558564
15b8a2efb9 [Update] 修改小问题 2019-12-03 12:03:18 +08:00
BaiJiangJie
45444149dd
Merge pull request #3482 from jumpserver/domain_search 
[Update] 修复网域列表页面无法搜索问题
 2019-12-03 12:01:05 +08:00
jym503558564
a5485011c8 [Update] 修复网关搜索报500错误；密码为空时，测试连接报500错误 2019-12-03 11:24:12 +08:00
jym503558564
7c5592fa36 [Update] 修复网域列表页面无法搜索问题 2019-12-03 10:40:55 +08:00
ibuler
715b04e2b2 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-12-02 10:50:19 +08:00
ibuler
73086328e4 [Update] 去掉elfinder包 2019-12-02 10:49:58 +08:00
BaiJiangJie
7f126ab652
Merge pull request #3475 from jumpserver/dev_bai 
[Update] 修改Dockerfile，安装 wheel 依赖
 2019-11-29 19:13:56 +08:00
BaiJiangJie
5bcd122de9 [Update] 修改Dockerfile，安装 wheel 依赖 2019-11-29 19:13:02 +08:00
jym503558564
a92aec2775 Merge branch 'dev' into user_detail_template 2019-11-25 15:55:44 +08:00
jym503558564
cc9554cdb4 [Update] 修改用户详情页中添加用户组标签的显示条件是：当前组织的普通用户或组管理员 2019-11-25 15:30:11 +08:00
BaiJiangJie
100dd24ff5
Merge pull request #3457 from jumpserver/dev 
Dev
 2019-11-22 16:53:16 +08:00
BaiJiangJie
3a812c2267
Merge pull request #3456 from jumpserver/dev_bai 
[Update] 发送重置密钥邮件时，清除用户公钥
 2019-11-22 16:52:47 +08:00
BaiJiangJie
f47781a330 [Update] 发送重置密钥邮件时，清除用户公钥 2019-11-22 16:48:20 +08:00
BaiJiangJie
f96dd15f20
Merge pull request #3454 from jumpserver/1.5.5_bai 
[Update] 修改工单管理列表可以按照类型排序 以及 日期显示格式
 2019-11-22 16:17:51 +08:00
BaiJiangJie
ffdc1eb198 [Update] 修改工单管理列表可以按照类型排序 以及 日期显示格式 2019-11-22 16:16:29 +08:00
BaiJiangJie
91d1a62c98
Merge pull request #3453 from jumpserver/dev 
Dev
 2019-11-22 13:54:37 +08:00
BaiJiangJie
793adbccab
Merge pull request #3452 from jumpserver/dev 
Dev
 2019-11-22 13:54:08 +08:00
BaiJiangJie
72ea036a29
Merge pull request #3451 from jumpserver/dev_bai 
[Update] 删除 LDAP 查询时抛出的自定义异常类（ LDAPOUGroupException），解决多有 OU 下导入用户时的问题
 2019-11-22 13:53:25 +08:00
BaiJiangJie
9e322323f3 [Update] LDAP 分页获取 cookie 取值添加异常捕获 2019-11-22 13:52:29 +08:00
BaiJiangJie
6951f4dd97 [Update] 删除 LDAP 查询时抛出的自定义异常类（ LDAPOUGroupException），解决多有 OU 下导入用户时的问题 2019-11-22 12:25:49 +08:00
jym503558564
54887a3460 [Update] 修改用户详情页中用户组标签不显示的问题 2019-11-20 17:27:49 +08:00
老广
dafe71af42
Merge pull request #3446 from jumpserver/dev 
[Update] 修改jms
 2019-11-20 14:47:12 +08:00
ibuler
82b9c2519b [Update] Merge it 2019-11-20 12:04:52 +08:00
ibuler
d563a11acf [Update] 修改jms 2019-11-20 11:57:53 +08:00
老广
c5438fd65d
Merge pull request #3445 from jumpserver/dev 
Dev
 2019-11-20 10:26:34 +08:00
ibuler
66b8e59ae7 [Update] 修改nav 2019-11-19 15:49:41 +08:00
ibuler
e424315d93 [Update] 修改用户列表serializer 2019-11-19 15:25:28 +08:00
ibuler
4c801bb828 [Update] 修改用户列表 2019-11-19 15:23:19 +08:00
ibuler
1bba00412a [Update] 修改user list 页面字段宽度 2019-11-19 11:25:36 +08:00
ibuler
bf40aa8df0 [Update] 修改user list api 2019-11-19 11:20:26 +08:00
ibuler
0c349f9350 [Update] 更改翻译 2019-11-19 10:30:32 +08:00
ibuler
4dc5d7d70e [Update] 换做lazyproperty 2019-11-19 10:26:01 +08:00
ibuler
3fc30aa96c [Update] 修改tickets 2019-11-18 18:44:21 +08:00
ibuler
bb1349e962 [Update] 修改MFA 2019-11-18 18:12:03 +08:00
ibuler
c9ee8edeaf [Update] 修改mfa 2019-11-18 16:30:26 +08:00
ibuler
bfd8a9c66d [Update] 修改asset permission搜索 2019-11-18 15:18:47 +08:00
ibuler
030551d987 [Update] 工单提交 2019-11-18 12:14:16 +08:00
ibuler
2f4096bf3d [Update] 修改ticket 2019-11-18 11:54:12 +08:00