github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-07-01 01:11:58 +00:00
Code Issues Projects Releases Wiki Activity
7,199 Commits 98 Branches 217 Tags 35 MiB
pr@dev@perf_detail_drawer
Commit Graph

7199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Orange
8a76bb05ac
Merge pull request #208 from jumpserver/jym_bug_fix 
fix(settings): 修复安全设置页面更新不了的问题
 2020-07-16 15:49:18 +08:00
Orange
ad5b5c7c20
Merge pull request #207 from jumpserver/jym_bug_fix 
fix(settings): 修复安全设置页面更新不了的问题
 2020-07-16 15:48:40 +08:00
jym503558564
fe7d43f669 fix(settings): 修复安全设置页面更新不了的问题 2020-07-16 15:35:42 +08:00
八千流
aad23f3de5
Merge pull request #202 from jumpserver/dev 
merge(master): Merge from dev to master
 2020-07-16 11:12:33 +08:00
八千流
9c33093b01
Merge pull request #205 from jumpserver/update_xpack 
update:Xpack
 2020-07-16 11:11:00 +08:00
OrangeM21
c94a5dfa1f update:Xpack 2020-07-16 11:08:24 +08:00
八千流
143973531c
Merge pull request #204 from jumpserver/update_xpack_master 
fix: 更新Master Xpack代码
 2020-07-16 11:05:29 +08:00
OrangeM21
7db590950c fix: 更新Master Xpack代码 2020-07-16 11:04:13 +08:00
八千流
7e65a52062
Merge pull request #203 from jumpserver/update_xpack 
fix: 更新Xpack代码
 2020-07-16 11:01:05 +08:00
OrangeM21
226d118d28 fix: 更新Xpack代码 2020-07-16 10:58:49 +08:00
老广
0e3bd186fe
Merge pull request #201 from jumpserver/v2.0 
Merge v2.0
 2020-07-16 10:44:27 +08:00
八千流
50e8dfc86d
fix(timeFormat): 统一时间格式 (#197) 
* fix(timeFormat): 统一时间格式

* fix: 更新Xpack代码

Co-authored-by: OrangeM21 <orangemtony@gmail.com>
 2020-07-15 20:46:01 +08:00
OrangeM21
a023e03074 fix: 更新Xpack代码&&用户界面资产添加备注选项 
Closes https://github.com/jumpserver/trello/issues/75
 2020-07-15 20:43:39 +08:00
OrangeM21
a0a592f064 fix(AssetUpdate): 创建资产网域选项可清空 
Closes https://github.com/jumpserver/lina/issues/141
 2020-07-15 20:19:15 +08:00
八千流
4d86edd65e
fix(ldapUserListFix): 优化ldap用户列表勾选后关闭页面，再次打开时，上一次选中的状态还存在的问题 (#192) 
* fix(ldapUserListFix): 优化ldap用户列表勾选后关闭页面，再次打开时，上一次选中的状态还存在的问题
 2020-07-15 18:34:17 +08:00
Orange
c597bc1dca
fix(SessionList): 修复命令详情参数及在线会话快捷操作组件 (#198) 
* fix(SessionList): 修复命令详情参数及在线会话快捷操作组件

Closes https://github.com/jumpserver/trello/issues/72

* fix: 更新API参数
 2020-07-15 18:31:13 +08:00
OrangeM21
a3d45fd4b9 fix(UserProfile): 修复登录密码后没有立即提示退出登录等问题 
Closes https://github.com/jumpserver/trello/issues/23
 2020-07-15 18:23:00 +08:00
jym503558564
e16d3c2e3f fix(changePasswd): 添加changePassword创建页面中的翻译 2020-07-15 18:21:17 +08:00
OrangeM21
e251127f6e fix(AssetUserTable): 去掉删除资产的前端提示，改为由后端提示 
Closes https://github.com/jumpserver/trello/issues/30
 2020-07-15 18:19:20 +08:00
jym503558564
58b8917739 fix(ldap): 修复LDAP一键导入不选择用户，导入了全部用户的问题 2020-07-15 18:18:26 +08:00
八千流
ad423e921a
fix(highlight): 修复创建资源后跳转到列表页世，左侧菜单没有高亮问题 (#191) 2020-07-15 17:54:11 +08:00
八千流
326302ea5f
fix(setting): 优化安全设置的一些字段提醒 (#190) 2020-07-15 17:52:54 +08:00
八千流
be213268fa
fix(firefox_time_fix): 修改有些列表页面的时间在firefox上显示不出来的问题 (#189) 2020-07-15 17:51:10 +08:00
OrangeM21
b82231f3ea fix(Userlist): 添加禁止更新和禁止删除的权限判断 
Closes https://github.com/jumpserver/trello/issues/29
 2020-07-15 17:49:48 +08:00
Orange
f976800cde
fix: 修改弹窗按钮高亮提示 (#187) 2020-07-15 17:47:22 +08:00
OrangeM21
4973c62618 fix: 用户来源不为Local的时候禁止更新密码 
Closes https://github.com/jumpserver/trello/issues/44
 2020-07-15 17:46:04 +08:00
Orange
5db7538216
Merge pull request #182 from jumpserver/remote_permission_fix 
fix(remote_app_permission): 修复创建远程应用页面系统用户的获取
 2020-07-09 18:29:38 +08:00
Orange
786528f9b2
Merge pull request #184 from jumpserver/remote_permission_fix 
fix(remote_app_permission): 修复创建远程应用页面系统用户的获取
 2020-07-09 18:29:19 +08:00
Orange
661409b99d
Merge pull request #183 from jumpserver/remote_permission_fix 
fix(remote_app_permission): 修复创建远程应用页面系统用户的获取
 2020-07-09 18:29:04 +08:00
ibuler
702bb3acfa ci(build): 修改构建，使用严格模式 2020-07-09 17:50:05 +08:00
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