Commit Graph

7276 Commits

Author SHA1 Message Date
OrangeM21
4c1ee3bb46 Merge branch 'master' into tmp_orange 2020-03-26 01:10:16 +08:00
OrangeM21
fbcfc83aa8 [fix] 2020-03-26 01:02:48 +08:00
ibuler
1a88ee5e49 [Update] 更改paging 2020-03-25 21:06:47 +08:00
ibuler
a68cb92c41 [Update] 优化一波 2020-03-25 18:46:04 +08:00
OrangeM21
80955f9804 [fix] 2020-03-25 17:32:33 +08:00
ibuler
8630e9d890 [Update] 修改组件名称 2020-03-25 14:58:18 +08:00
ibuler
d4d3b3e4af [Update] 修改组件 2020-03-25 14:23:58 +08:00
ibuler
ae4ce899f3 [Update] 优化布局 2020-03-25 13:57:08 +08:00
ibuler
6c237984ca Merge branch 'master' of github.com:jumpserver/lina 2020-03-24 17:12:54 +08:00
ibuler
9c7aa38980 [Update] 用户列表修改 2020-03-24 17:06:17 +08:00
OrangeM21
88497277a0 [fix]修复拼写错误 2020-03-24 15:31:12 +08:00
OrangeM21
a2c6e419b3 [update]修改表单样式 2020-03-24 15:30:10 +08:00
OrangeM21
9fa15b88b6 [update]修改样式 添加TagView 2020-03-24 12:24:55 +08:00
ibuler
02913b2dfe Merge branch 'master' of github.com:jumpserver/lina 2020-03-24 11:29:16 +08:00
ibuler
48d21422d7 [Update] 有货左侧菜单 2020-03-24 11:28:56 +08:00
OrangeM21
e04c745ff6 [fix]修改标题名 2020-03-24 11:27:27 +08:00
OrangeM21
880208db95 [fix]修复 Menu 折叠图标Bug 2020-03-24 11:01:51 +08:00
OrangeM21
843b1c70b6 [fix]修复Eslint bug 2020-03-24 10:43:14 +08:00
ibuler
d809a90946 Merge branch 'master' of github.com:jumpserver/lina 2020-03-24 10:27:54 +08:00
ibuler
a04ddd62eb [Update] 修改路由 2020-03-23 19:36:17 +08:00
OrangeM21
8799215a75 [fix]修复大小写bug 2020-03-23 19:32:15 +08:00
OrangeM21
b5768fd64d [fix]修复大小写bug 2020-03-23 19:27:44 +08:00
ibuler
86fc9d595e Merge branch 'master' of github.com:jumpserver/lina 2020-03-23 19:15:36 +08:00
ibuler
b353706245 [Update] 修改菜单 2020-03-23 19:15:17 +08:00
OrangeM21
638b9e591f [fix]修复bug 2020-03-23 18:58:51 +08:00
OrangeM21
2d19b63bf6 Merge branch 'orange_dev' 2020-03-23 18:44:52 +08:00
OrangeM21
f37ecb97c7 [update]更新下拉菜单操作 2020-03-23 18:44:13 +08:00
OrangeM21
3e71926176 [fix] 2020-03-23 18:25:28 +08:00
OrangeM21
e1fc717589 [update]数据缓存 2020-03-23 18:22:10 +08:00
ibuler
276e84ffb2 Merge branch 'master' of github.com:jumpserver/lina 2020-03-23 18:20:15 +08:00
ibuler
0b122aacfd [Update] 优化组件 2020-03-23 18:19:54 +08:00
OrangeM21
8bf43295f4 [fix]修复footer bug 2020-03-23 16:18:55 +08:00
OrangeM21
79b659b028 [update]准备组件分拆基础 2020-03-22 23:41:40 +08:00
Orange
89d7668814
Merge pull request #1 from jumpserver/jym_dev
[Update] 增加一些列表组件
2020-03-22 21:01:17 +08:00
OrangeM21
129c58d8c7 [UPDATE]修复Navbar样式bug 2020-03-22 16:36:00 +08:00
OrangeM21
6e90f8de23 [UPDATE]更新动画 2020-03-22 16:09:00 +08:00
OrangeM21
e5e44f03db [update]有bug状态 2020-03-22 16:00:33 +08:00
jym503558564
3b19fdf6f0 [Update] 增加命令过滤器列表组件 2020-03-22 11:46:09 +08:00
jym503558564
7dc161da86 [Update] 增加标签列表组件 2020-03-22 11:40:42 +08:00
jym503558564
ccaeaca3db [Update] 增加网域列表组件 2020-03-22 11:35:28 +08:00
jym503558564
4b0b46d23f [Update] 增加系统用户列表组件 2020-03-22 11:27:26 +08:00
jym503558564
5db2301b5d [Update] 增加管理用户列表组件 2020-03-22 11:15:33 +08:00
OrangeM21
885776f63c [update]添加font-awsome
[update]修改默认下拉菜单样式
2020-03-22 06:25:24 +08:00
OrangeM21
6f418bdf53 [update]增加判断条件 2020-03-22 05:30:30 +08:00
OrangeM21
e0b2bba927 [update]切换组织后重新刷新页面 2020-03-22 05:27:12 +08:00
OrangeM21
3410a76fb6 [update]添加全局footer 2020-03-22 02:12:57 +08:00
OrangeM21
224d060671 [update]完成用户组页面组 2020-03-22 01:05:47 +08:00
OrangeM21
cb1b4dd292 [update]完善用户管理模块 2020-03-21 04:47:46 +08:00
OrangeM21
d4a941cd80 [update]修改路由, 通配编辑路由 2020-03-21 04:15:32 +08:00
OrangeM21
88b3cb6c31 [fix]修复Eslint Error 2020-03-21 01:31:48 +08:00