Commit Graph

1616 Commits

Author SHA1 Message Date
老广
57e4b65059
Merge pull request #100 from jumpserver/dev
[hotfix]更改路由权限验证模块
2020-06-22 18:42:42 +08:00
Orange
bd0d1a1014
Merge pull request #109 from jumpserver/v2.0
[fix]更新路由权限,更新eslint Ignore
2020-06-22 18:36:20 +08:00
Orange
7b3e38ac78
Merge pull request #110 from jumpserver/v2.0.0_fix_route
[fix]抽象路由写法
2020-06-22 18:35:27 +08:00
OrangeM21
4927c6520a [fix]抽象路由写法 2020-06-22 18:31:59 +08:00
Orange
c10145c9cc
Merge pull request #108 from jumpserver/v2.0.0_fix_route
[fix]Terminal路由分组,更新Eslint
2020-06-22 16:25:43 +08:00
OrangeM21
7eccb20269 [fix]更新路由权限,更新eslint Ignore 2020-06-22 16:15:56 +08:00
Orange
26ec366332
Merge pull request #107 from jumpserver/dev
[hotfix]修复系统设置页面无法提交安全设置的问题
2020-06-19 18:56:57 +08:00
OrangeM21
0ed6ad055e [hotfix]修复系统设置页面无法提交安全设置的问题 2020-06-19 18:51:43 +08:00
Orange
ff5b77c1a9
Merge pull request #106 from jumpserver/dev
[fix]修复bugs
2020-06-19 18:34:18 +08:00
OrangeM21
7f788a4610 [fix]修复修改密码页面不会退出的问题 2020-06-19 16:45:13 +08:00
OrangeM21
553805e03d [fix]修复系统设置没有初始值的问题 2020-06-19 16:03:12 +08:00
OrangeM21
f9f90e55c1 [fix]修改页面路由权重问题 2020-06-19 15:08:14 +08:00
Orange
4be2db93c7
Merge pull request #105 from jumpserver/dev
[fix]fix bugs
2020-06-18 19:35:10 +08:00
OrangeM21
65855b3e07 [fix]无路由情况打印报错信息 2020-06-18 19:29:37 +08:00
OrangeM21
3ff5519bfa [hotfix]修复初始化获取命令执行为空导致无法登陆的问题 2020-06-18 18:52:33 +08:00
Orange
a79af0a7c4
Merge pull request #103 from jumpserver/dev
[hotfix]修复会话详情页面下载URL
2020-06-18 17:16:50 +08:00
OrangeM21
4f120ae81d [hotfix]修复会话详情页面下载URL 2020-06-18 17:15:18 +08:00
Orange
9e7c570216
Merge pull request #102 from jumpserver/dev
[hotfix]修改build目录
2020-06-18 15:34:38 +08:00
OrangeM21
1cd4f1f228 [hotfix]修改build目录 2020-06-18 15:32:11 +08:00
Orange
d35cfa11b0
Merge pull request #101 from jumpserver/dev
[hotfix]更改路由权限验证模块
2020-06-18 11:28:23 +08:00
OrangeM21
db30ce67a0 [hotfix]更改路由权限验证模块 2020-06-18 11:16:13 +08:00
Orange
5aa28903dd
Merge pull request #99 from jumpserver/dev
[feature] v2.0 Release
2020-06-18 11:04:32 +08:00
Orange
b67a383cd0
Merge pull request #98 from jumpserver/dev
[feature] v2.0 Release
2020-06-18 10:45:09 +08:00
OrangeM21
5f5474d10f [fix]修改过滤路由参数名称 2020-06-18 00:40:23 +08:00
OrangeM21
f0fbce4543 [fix]过滤路由 2020-06-17 20:55:40 +08:00
OrangeM21
3583657f4f [fix] 2020-06-17 19:55:52 +08:00
OrangeM21
987e44225a [fix] 2020-06-17 19:11:07 +08:00
OrangeM21
0615e0cd21 Merge remote-tracking branch 'origin/dev' into dev 2020-06-17 18:37:33 +08:00
OrangeM21
c8bc3ff0d2 [fix] 2020-06-17 18:37:18 +08:00
Bai
9a81e1bd11 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-17 17:24:46 +08:00
Bai
d45fe73796 [Update] 修改版本号,修改管理页面文案 2020-06-17 17:24:30 +08:00
xinwen
feae7a516f [Update] 作业中心/任务列表 Card 间距 2020-06-17 17:17:02 +08:00
OrangeM21
ea7c16bdce Merge branch 'dev' of https://github.com/jumpserver/lina into dev 2020-06-17 16:47:42 +08:00
OrangeM21
872fbb2a29 update submodule url 2020-06-17 16:47:24 +08:00
Bai
4f5cad5374 [Update] 用户详情页面激活后提示成功信息 2020-06-17 16:33:42 +08:00
OrangeM21
1ddb3e89d5 [fix]修复下载录像接口 2020-06-17 16:32:20 +08:00
Orange
41ef60acc5
Merge pull request #97 from jumpserver/feature_add_submodule
[feature]修改Submodules
2020-06-17 16:10:51 +08:00
OrangeM21
4f11652e9c [feature]修改Submodules 2020-06-17 15:52:04 +08:00
OrangeM21
962a13ef2a [fix] 2020-06-17 15:23:21 +08:00
Bai
077e7ca583 [Update] 修改API-Key启/停文案 2020-06-17 15:06:04 +08:00
OrangeM21
b05814d251 [fix]修复密码匣子导入问题 2020-06-17 13:57:09 +08:00
OrangeM21
675e9d3005 Merge remote-tracking branch 'origin/dev' into dev 2020-06-17 11:42:17 +08:00
OrangeM21
f850cf0d55 [fix]修复命令执行问题过滤问题 2020-06-17 11:41:58 +08:00
ibuler
eee78a1f2c fix: 去除一部分debug 2020-06-16 19:55:10 +08:00
ibuler
f42f649e8d Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 19:52:34 +08:00
ibuler
bd690501eb fix: 修改用户授权资产loadding问题 2020-06-16 19:52:13 +08:00
Eric
97328a7e3d remove favor action 2020-06-16 19:29:02 +08:00
Eric
b953c6c5a2 ldap user import 2020-06-16 19:07:46 +08:00
Bai
2792e0c303 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 18:25:42 +08:00
Bai
d59946d5aa [Update] 删除GrantedAssets组件OnSelected中的方法调用 2020-06-16 18:25:09 +08:00