github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-07-09 13:13:25 +00:00
Code Issues Projects Releases Wiki Activity
6,986 Commits 98 Branches 217 Tags 35 MiB
pr@dev@risk
Commit Graph

6986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Orange
47c05922ae
Merge pull request #159 from jumpserver/v2.0 
fix(many): v2.0中修改的bug Merge到master
 2020-07-08 11:51:06 +08:00
ibuler
a036562e5c ci(build&release): 添加ci, 自动化构建 2020-07-08 11:47:05 +08:00
Orange
a92f09f6af
Merge pull request #157 from jumpserver/command_storage_fix 
fix: 优化命令存储创建页面，主机字段提示信息的翻译问题
 2020-07-08 10:59:26 +08:00
jym503558564
a2d6281a6a fix: 优化命令存储创建页面，主机字段提示信息的翻译问题 2020-07-08 10:56:55 +08:00
Orange
36fa19df89
Merge pull request #155 from jumpserver/fix_relation_card_add_bug 
fix(relationCard): 修改关系卡片的bug
 2020-07-07 19:14:12 +08:00
Orange
f72baa33e3
Merge pull request #153 from jumpserver/jym_fix 
fix: 修改资产详情网域字段显示，以及去掉一些多余的东西
 2020-07-07 19:12:11 +08:00
Orange
9c415fca87
Merge pull request #154 from jumpserver/jym_dev 
fix: 修复时间兼容firefox
 2020-07-07 19:11:44 +08:00
ibuler
0ef5852fd8 fix(relationCard): 修改关系卡片的bug 
原来数据是从 options 中过滤获取的, 当搜索结束后就无法在获取到，所以改成从select中获取选中的
 2020-07-07 19:08:30 +08:00
jym503558564
dac04cfa61 fix: 修复时间兼容firefox 2020-07-07 18:40:07 +08:00
jym503558564
68149563fc fix: 修改资产详情网域字段显示，以及去掉一些多余的东西 2020-07-07 15:59:46 +08:00
Orange
37cce2effd
Merge pull request #150 from jumpserver/fix_assetslist_actions 
fix: 修复资产列表批量操作提交报错的问题
 2020-07-07 15:35:39 +08:00
Orange
5412e40856
Merge pull request #151 from jumpserver/v2.0_i18n 
feat(i18n): 修改翻译
 2020-07-07 14:50:03 +08:00
Bai
6ae70c8c41 feat(i18n): 修改翻译 2020-07-07 14:41:18 +08:00
OrangeM21
06fc671547 fix: 更新Submodule链接 2020-07-06 19:35:31 +08:00
OrangeM21
6571615643 fix: 修复资产列表批量操作提交报错的问题 2020-07-06 19:27:50 +08:00
OrangeM21
b0c03b6c1f fix: 修复系统用户添加空资产成功的问题 2020-07-06 18:37:45 +08:00
OrangeM21
6be89ba479 fix: 修复系统用户添加空资产成功的问题 2020-07-06 18:33:24 +08:00
Orange
56f58d49cc
Merge pull request #147 from jumpserver/fix_rule_errors 
fix: 修复用户界面可以创建节点的问题
 2020-07-06 17:57:23 +08:00
OrangeM21
c4efba4c83 fix: 修复用户界面可以创建节点的问题 2020-07-06 17:56:10 +08:00
Orange
14a15efcd9
Merge pull request #146 from jumpserver/fix_rule_errors 
fix: 修复已知Issues
 2020-07-06 17:50:54 +08:00
OrangeM21
3e32eae8f3 fix: 修复已知Issues 
修复审计员权限无法打开用户界面的问题
修复英文状态下基础列表宽度问题
修复收藏节点无法右键的问题
修复Firefox无法打开系统用户详情的问题
 2020-07-06 17:49:28 +08:00
Orange
7e0f53e403
Merge pull request #139 from jumpserver/jym_dev 
fix: 统一详情中左右侧布局组件
 2020-07-06 11:16:05 +08:00
Orange
0d172f94b2
Merge pull request #140 from jumpserver/fix_terminal_url 
fix: 修复终端详情获取异常的问题
 2020-07-06 11:15:27 +08:00
OrangeM21
b1fc95db5b fix: 修复终端详情获取异常的问题 2020-07-06 11:13:28 +08:00
jym503558564
9c16321ed7 fix: 统一详情中左右侧布局组件 2020-07-06 10:46:27 +08:00
Orange
1e98827e98
Merge pull request #136 from jumpserver/fix_update_bulkdeleteUrl 
fix: 修复批量删除链接的bug
 2020-07-04 18:44:21 +08:00
OrangeM21
38d5b81cd0 fix: 修复批量删除链接的bug 2020-07-04 18:42:41 +08:00
Orange
fda09a6712
Merge pull request #134 from jumpserver/dev 
feat: 优化表格组件
 2020-07-03 17:39:26 +08:00
Orange
5bed98b991
Merge pull request #133 from jumpserver/jym_dev 
fix: 优化表格宽度，优化资产树显示的位置大小可等比例缩放
 2020-07-03 17:37:54 +08:00
jym503558564
6d4c9f3676 fix: 修改资产树显示位置的大小可等比例缩放 2020-07-03 16:10:05 +08:00
Orange
fe84cf42eb
Merge pull request #132 from jumpserver/fix_ldap_setting 
fix: 优化Ldap认证设置
 2020-07-03 16:03:07 +08:00
jym503558564
e6295c9dc5 fix: 优化表格宽度 2020-07-03 16:02:38 +08:00
OrangeM21
d79b178229 fix: 优化Ldap认证设置 2020-07-03 16:00:05 +08:00
Orange
474e132f50
Merge pull request #129 from jumpserver/jym 
fix: 优化lina一些细节问题
 2020-07-03 14:01:45 +08:00
Orange
cad8c9aeb2
Merge pull request #131 from jumpserver/dev 
feat: 更新Xpack依赖
 2020-07-03 13:26:05 +08:00
八千流
d72cf1e825
Merge pull request #130 from jumpserver/update_xpack_release 
feat: 更新Xpack依赖
 2020-07-03 13:25:18 +08:00
OrangeM21
9e9c8639bc feat: 更新Xpack依赖 2020-07-03 13:06:52 +08:00
jym503558564
386afc9e0c fix: 整理统一 Lina List 2020-07-03 10:48:27 +08:00
jym503558564
acfe87f1c6 fix: 整理同样 Lina form 2020-07-02 18:41:53 +08:00
jym503558564
a9700e77f2 fix: 优化Lina 右上角切换用户页面的菜单对齐 2020-07-02 18:08:40 +08:00
jym503558564
36ed0a02c2 fix: 优化资产创建页面，协议组对齐 2020-07-02 17:54:59 +08:00
Orange
383d57c1c7
Merge pull request #128 from jumpserver/dev 
fix: Bump websocket-extensions from 0.1.3 to 0.1.4
 2020-07-02 17:13:19 +08:00
jym503558564
96863322ac fix: 优化用户页面中的资产详情dialog数据显示 2020-07-02 17:12:07 +08:00
dependabot[bot]
abf979c177
Bump websocket-extensions from 0.1.3 to 0.1.4 (#87) 
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-02 17:01:35 +08:00
八千流
d9a34a898f
Merge pull request #127 from jumpserver/v2.0 
feat: 更新Dev分支代码
 2020-07-02 16:55:57 +08:00
Orange
8105306278
Merge pull request #126 from jumpserver/feat_add_platform_chartset 
feat: 添加平台编码选项
 2020-07-02 16:43:43 +08:00
OrangeM21
e8073d9feb feat: 添加平台编码选项 
Closes https://github.com/jumpserver/jumpserver/issues/4207
 2020-07-02 16:38:18 +08:00
Orange
ac64ab7145
Merge pull request #121 from jumpserver/fix_unauthorized_error 
fix: 修复登录鉴权提示
 2020-07-02 15:20:29 +08:00
OrangeM21
8bd4e8b7c0 fix:修复登录鉴权提示 2020-07-02 15:15:04 +08:00
Orange
d581996e87
Merge pull request #119 from jumpserver/fix_assets_dialog_title 
fix: 修复资产 Dialog Title显示错误问题
 2020-07-02 12:06:22 +08:00