github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-07-09 05:03:11 +00:00
Code Issues Projects Releases Wiki Activity
2,269 Commits 98 Branches 217 Tags 35 MiB
a1ad901b40
Commit Graph

2269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jym503558564
448b64757c fix(remote_app_permission): 修复创建远程应用页面系统用户的获取 2020-07-09 17:44:51 +08:00
ibuler
4289c36bd4 ci(build): 修改构建，使用严格模式 2020-07-09 17:44:01 +08:00
ibuler
bbccba3731 ci(docker): 修改docker构建 2020-07-09 17:44:01 +08:00
ibuler
57b6e02960 fix(Docker): 修改Dockerfile，统一使用build.sh构建 2020-07-09 17:44:01 +08:00
ibuler
8c6d2a1150 ci(build): 修改构建，使用严格模式 2020-07-09 17:29:56 +08:00
ibuler
1295fb7fd2 ci(docker): 修改docker构建 2020-07-09 16:35:55 +08:00
BaiJiangJie
d3fbb9a391
Merge pull request #177 from jumpserver/ci 
ci(docker): 修改docker构建
 2020-07-09 16:31:23 +08:00
ibuler
2b14cf0225 ci(docker): 修改docker构建 2020-07-09 16:25:42 +08:00
BaiJiangJie
a78f8a3633
Merge pull request #176 from jumpserver/dev 
merge: Merge to master from branch dev
 2020-07-09 16:01:19 +08:00
何去何从
c4868dabac fix: 优化资产树 mini-button 添加 cursor:pointer 2020-07-09 15:40:41 +08:00
BaiJiangJie
faf848dca5
Merge pull request #175 from jumpserver/ci 
fix(Docker): 修改Dockerfile，统一使用build.sh构建
 2020-07-09 15:40:19 +08:00
ibuler
05edffe173 fix(Docker): 修改Dockerfile，统一使用build.sh构建 2020-07-09 15:35:44 +08:00
Orange
4b3862443a
Merge pull request #173 from jumpserver/master_merge 
fix: lina dev中xpack的commit号指向xpack master
 2020-07-09 14:20:31 +08:00
Orange
536ebd7513
Merge pull request #172 from jumpserver/master_merge 
fix: lina master中xpack的commit号指向xpack master
 2020-07-09 14:16:59 +08:00
jym503558564
7dce39d79c fix: lina master中xpack的commit号指向xpack master 2020-07-09 14:14:06 +08:00
八千流
a8389304d6
Merge pull request #171 from jumpserver/master 
Merge Master 代码
 2020-07-09 13:53:18 +08:00
Orange
649d4ac848
Merge pull request #170 from jumpserver/v2.0 
feat: 更新Master代码
 2020-07-09 13:44:11 +08:00
Orange
781bbe0ffa
Merge pull request #169 from jumpserver/audit_fix 
fix(audit): 修复时间显示兼容firefox
 2020-07-09 12:01:28 +08:00
jym503558564
2771d80749 fix(audit): 修复时间显示兼容firefox 2020-07-09 11:48:27 +08:00
八千流
86b5cb81fc
Merge pull request #168 from jumpserver/v2.0 
feat: 更新Master代码
 2020-07-08 17:30:03 +08:00
Orange
273dc7234b
Merge pull request #167 from jumpserver/ci 
ci(release): 统一releaes title
 2020-07-08 17:27:38 +08:00
ibuler
9927bf46b5 ci(release): 统一releaes title 2020-07-08 17:26:36 +08:00
OrangeM21
652919f827 chore: 修改版本号为2.0.2 2020-07-08 16:44:13 +08:00
Orange
9f5d121f9c
Merge pull request #165 from jumpserver/v2.0_system_user 
fix(system_user): 修复系统用户创建/更新页面认证信息字段显示、隐藏、翻译问题
 2020-07-08 15:03:33 +08:00
Bai
efb5de9289 fix(i18n): 修改系统用户密码字段helpMessage 2020-07-08 15:01:53 +08:00
Bai
d94b3c9fc9 fix(system_user): 修复系统用户创建/更新页面认证信息字段显示隐藏问题 2020-07-08 14:57:46 +08:00
Orange
50482d5d8b
Merge pull request #164 from jumpserver/update_xpack 
fix(xpack): 更新Xpack依赖
 2020-07-08 14:40:49 +08:00
OrangeM21
15ed63f589 fix(xpack): 更新Xpack依赖 2020-07-08 14:39:30 +08:00
八千流
1ffcf9e7b4
Merge pull request #163 from jumpserver/v2.0 
revert: 撤销网域显示ID的修复
 2020-07-08 14:02:27 +08:00
Orange
6afc54391b
Merge pull request #162 from jumpserver/revert_domain_name 
revert: 撤销网域显示ID的修复
 2020-07-08 14:01:02 +08:00
OrangeM21
d1bb6b8909 revert: 撤销网域显示ID的修复 2020-07-08 14:00:17 +08:00
Orange
a665d6ed20
Merge pull request #161 from jumpserver/v2.0 
ci(fix): 修改ci使用的action为node10
 2020-07-08 12:03:17 +08:00
ibuler
00e2e7e433 ci(fix): 修改ci使用的action为node10 2020-07-08 12:02:08 +08:00
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