github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-06-30 00:43:03 +00:00
Code Issues Projects Releases Wiki Activity
7,199 Commits 97 Branches 216 Tags 34 MiB
pr@dev@perf_detail_drawer
Commit Graph

7199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
OrangeM21
dba6276f36 Merge remote-tracking branch 'origin/dev' into dev 2020-06-16 18:22:55 +08:00
OrangeM21
d9ea133db1 [fix] 2020-06-16 18:22:41 +08:00
Bai
7bc1912d6d Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 18:07:39 +08:00
Bai
f16d116234 [Update] 修改用户页面资产授权规则is_valid字段、授权的资产点击节点刷新table 2020-06-16 18:07:16 +08:00
ibuler
86306c7bc9 fix: 去掉debug 2020-06-16 18:05:08 +08:00
ibuler
8447e954cc Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 17:40:06 +08:00
ibuler
6ccdaf71e4 fix: 修改table config，变化时自动reload 2020-06-16 17:39:44 +08:00
OrangeM21
83537933b1 Merge remote-tracking branch 'origin/dev' into dev 2020-06-16 17:39:37 +08:00
OrangeM21
23b2209b3c [fix]命令执行Error 2020-06-16 17:39:16 +08:00
ibuler
2182cb33da Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 17:26:52 +08:00
ibuler
0a97ebd403 feat: 修改导出，修改用户创建和更新中的password 2020-06-16 17:22:41 +08:00
Bai
fb0f7bb0f8 [Update] 用户详情远程应用/数据库应用搜索框添加名称搜索 2020-06-16 17:17:23 +08:00
Bai
96eb5c435b [Update] 资产授权规则搜索有效添加children 2020-06-16 17:11:54 +08:00
Bai
a562a0b527 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 16:55:40 +08:00
Bai
193303e6c5 [Update] 解决用户详情资产授权规则列表跳转问题 2020-06-16 16:49:49 +08:00
OrangeM21
a44ca1bfc0 Merge remote-tracking branch 'origin/dev' into dev 2020-06-16 16:43:39 +08:00
OrangeM21
ca57a92d28 [fix]用户激活添加提示 2020-06-16 16:43:22 +08:00