Commit Graph

172 Commits

Author SHA1 Message Date
ibuler
f456dff551 [Update] 修改asset select2 2020-05-29 20:37:23 +08:00
ibuler
2efd303323 merge: with origin 2020-05-29 10:59:03 +08:00
ibuler
380b0a35ae merge: with master 2020-05-28 18:44:25 +08:00
BaiJiangJie
5a2e5cda8b Merge pull request #67 from jumpserver/profile
Profile
2020-05-28 17:48:20 +08:00
OrangeM21
81be1e046e Merge remote-tracking branch 'origin/master' 2020-05-28 16:21:46 +08:00
OrangeM21
460fa7aa72 [fix]修复组件更新Url Bug 2020-05-28 16:21:24 +08:00
ibuler
ae855ea3f6 merge: with master 2020-05-28 16:13:01 +08:00
ibuler
13589ce9cb feat: 修改actions formatter 使用formatterAegs 2020-05-28 16:06:57 +08:00
xinwen
54ac9b5109 [Update] 进入 Detail 页面可以指定 Tab 2020-05-28 14:30:54 +08:00
Bai
03e9425fc8 [Update] 修改个人信息目录结构 2020-05-28 10:59:13 +08:00
ibuler
dbe17fbc04 [Update] 修改core 2020-05-27 19:29:49 +08:00
Bai
d7447b43cb [Update] 添加UserProfile页面;Nav 添加 userProfile 跳转;routes 添加commonRoutes(userProfile) 2020-05-27 16:59:52 +08:00
ibuler
462bf02fa6 [Feature] 重命名一些组件 2020-05-27 15:45:03 +08:00
ibuler
16b305d31b [Feature] 重命名一些组件 2020-05-27 15:44:18 +08:00
ibuler
2e0ba0333b Merge branch 'master' of github.com:jumpserver/lina 2020-05-27 11:16:17 +08:00
ibuler
cf7fe1c129 [Update] 完善代码 2020-05-27 11:14:32 +08:00
OrangeM21
357f00b859 Merge remote-tracking branch 'origin/master' 2020-05-26 18:20:58 +08:00
OrangeM21
4806634e3e [update]完善页面图标和添加动态图标功能 2020-05-26 18:20:24 +08:00
ibuler
c7aafa622c Merge branch 'master' of github.com:jumpserver/lina 2020-05-26 14:48:26 +08:00
ibuler
0475149bae [UPdate] 修改tag search 2020-05-26 14:48:09 +08:00
Bai
0921ebbc99 [Update] 添加改密计划详情页面-执行列表-执行详情页面(1) 2020-05-25 18:43:46 +08:00
ibuler
27a24bb5dd [Update] merge 2020-05-25 17:41:43 +08:00
ibuler
38a97781c3 [Update] 修改i18n 2020-05-25 17:36:51 +08:00
OrangeM21
45ca9454f3 [update]完成APIkey页面 修复bug 2020-05-24 18:14:36 +08:00
OrangeM21
0328fb6f0b [fix]修复组件框编译引用路径Bug 2020-05-23 15:32:02 +08:00
ibuler
e7dc42fd07 Merge branch 'master' of github.com:jumpserver/lina 2020-05-22 18:38:28 +08:00
ibuler
a54b8b3c8e [Update] 去掉一些import export 2020-05-22 18:37:34 +08:00
xinwen
27eaaeb592 [Update] 修复 云管中心 三级菜单嵌套问题 2020-05-22 17:46:42 +08:00
jym503558564
f6e0349e5c [Update] 修改任务模块中执行任务的跳转 2020-05-22 17:42:33 +08:00
ibuler
3d6c259214 Merge branch 'master' of github.com:jumpserver/lina 2020-05-21 16:18:53 +08:00
ibuler
d43a30932e [Update] 优化一些问题 2020-05-21 16:18:28 +08:00
OrangeM21
cbe8d5d7db [fix]用户界面隐藏组织 2020-05-21 11:40:47 +08:00
OrangeM21
0627199695 [fix]添加用户页面和管理员页面切换 2020-05-19 17:41:47 +08:00
OrangeM21
97c60de58c [fix]修复Build Bug 2020-05-19 15:26:46 +08:00
ibuler
f07e68113d [Update] 更新store settings 2020-05-18 15:52:08 +08:00
ibuler
785ee96e96 [Update] select 背景色 2020-05-14 17:15:05 +08:00
ibuler
efafcd0fd1 [Update] 修改 table form tooltips 2020-05-14 15:20:03 +08:00
ibuler
27bd6790eb [Update] 拆分language 2020-05-14 13:45:04 +08:00
ibuler
ec24cca32f [Update] 修改language逻辑 2020-05-14 11:38:39 +08:00
ibuler
540062fb09 [Update] 去掉默认使用tr的方式,避免i18n extract无法检测 2020-05-14 11:19:01 +08:00
ibuler
8fd8edf845 [Update] 修改了翻译 2020-05-13 14:41:28 +08:00
ibuler
5000bb6d24 [Update] 修改routes 和 i18n 2020-05-13 11:02:36 +08:00
ibuler
4da8085c03 [Update] 修改i18n 2020-05-12 11:26:21 +08:00
ibuler
6de50f1e00 [Update] 去掉i18n的过度包装 2020-05-11 15:58:13 +08:00
ibuler
1dafaf12aa Merge branch 'master' of github.com:jumpserver/lina 2020-05-11 12:06:50 +08:00
OrangeM21
86c1d7a7a0 [fix]修改i18n,更新语言环境至localstorage 2020-05-11 12:06:23 +08:00
ibuler
ebc92b4f9c [Update] 修改i18n 2020-05-11 11:51:36 +08:00
ibuler
e4c2cd1f5a [Update] Merge 2020-05-11 10:38:18 +08:00
ibuler
824f96e479 [Update] 修改tab page逻辑,避免刷新回到第一个tab 2020-05-09 19:44:39 +08:00
ibuler
a9db2a0b7e [Update] merge it 2020-05-09 14:59:12 +08:00