Commit Graph

734 Commits

Author SHA1 Message Date
Captain.B 23afff82af Merge remote-tracking branch 'origin/dev' into dev 2020-05-14 16:25:12 +08:00
Captain.B 6952030e18 resource pool page 2020-05-14 16:24:25 +08:00
chenjianxing 2237c87f01 修改测试用例列表样式 2020-05-14 16:23:43 +08:00
wenyann 818b5faa03 查询默认语言 2020-05-14 16:19:42 +08:00
q4speed 26dae54302 Merge remote-tracking branch 'origin/dev' into dev 2020-05-14 15:16:33 +08:00
q4speed b4f300d275 i18n 2020-05-14 15:03:44 +08:00
Captain.B 95639d7194 Merge remote-tracking branch 'origin/dev' into dev 2020-05-14 14:58:55 +08:00
Captain.B 97ed3c8fb1 i18n 2020-05-14 14:58:30 +08:00
q4speed 566cbc634b Merge remote-tracking branch 'origin/dev' into dev 2020-05-14 14:53:16 +08:00
q4speed 0c42cee9ae 修复post body格式不正确的bug 2020-05-14 14:52:36 +08:00
Captain.B af7215cec6 Merge remote-tracking branch 'origin/dev' into dev 2020-05-14 14:52:35 +08:00
Captain.B 6f76bbfe9f i18n 2020-05-14 14:52:16 +08:00
chenjianxing c141e127f0 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-14 14:35:54 +08:00
chenjianxing b24825a8a4 优化测试报告预览 2020-05-14 14:35:21 +08:00
q4speed bbbae267ca Merge remote-tracking branch 'origin/dev' into dev 2020-05-14 14:33:54 +08:00
q4speed 96a70308e3 默认加载所有语言文件 2020-05-14 14:33:38 +08:00
chenjianxing ca47e1d5ff Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-14 13:21:43 +08:00
chenjianxing f835d627a1 fix 节点拖拽 2020-05-14 13:20:28 +08:00
q4speed 43183f4ba5 Merge remote-tracking branch 'origin/dev' into dev 2020-05-14 13:13:56 +08:00
q4speed 1b7938c167 修复直接用url打开页面时,无法正确定位一级菜单的问题 2020-05-14 13:13:42 +08:00
chenjianxing a7b0255e2b 测试计划-测绘用例添加所属模块字段 2020-05-14 12:50:09 +08:00
chenjianxing 0147fe152a 测试计划-编辑测试用例后保留搜索条件 2020-05-14 12:43:43 +08:00
chenjianxing 479dd28d05 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-14 11:53:31 +08:00
chenjianxing 2957e5acef 饼图样式 2020-05-14 11:53:14 +08:00
chenjianxing 2b3e148463 重命名节点更新模块字段 2020-05-14 11:41:45 +08:00
Captain.B d082ebc7d2 zh-tw 2020-05-14 11:34:15 +08:00
chenjianxing d569ef8582 解决面包屑key重复 2020-05-14 10:09:04 +08:00
chenjianxing 8c286795f7 拖拽节点更新模块字段 2020-05-14 09:34:11 +08:00
shiziyuan9527 a8dd83b3cc i18n 2020-05-13 18:12:15 +08:00
shiziyuan9527 96e275c095 用户角色国际化 2020-05-13 17:58:26 +08:00
Captain.B 6c2df5f122 float right 2020-05-13 16:29:19 +08:00
Captain.B bef5533656 菜单 2020-05-13 16:26:51 +08:00
shiziyuan9527 3bb0c0eb1a 语言切换入口 2020-05-13 16:07:18 +08:00
q4speed 05a2cf846e Merge remote-tracking branch 'origin/dev' into dev 2020-05-13 14:46:28 +08:00
q4speed 0cfc8c331b 先去掉描述 2020-05-13 14:46:12 +08:00
Captain.B 9d53c76e42 页面 2020-05-13 14:19:31 +08:00
q4speed cdf2d75e6f Merge remote-tracking branch 'origin/dev' into dev 2020-05-13 13:00:00 +08:00
q4speed 709c207fcc 场景公用变量和Header 2020-05-13 12:59:41 +08:00
chenjianxing c88030d1d2 节点操作点击事件禁止冒泡 2020-05-13 11:59:56 +08:00
chenjianxing 4c9f59d7d8 测试计划节点无法拖动 2020-05-13 11:56:51 +08:00
chenjianxing 93ae49263a 抽取表格过滤排序代码 2020-05-12 20:11:14 +08:00
chenjianxing dd7409681b Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-12 19:19:57 +08:00
chenjianxing 833560a70e fix 节点数报错 2020-05-12 19:19:11 +08:00
王振 8f9ad16870 测试用例步骤编辑自适应文本高度 2020-05-12 18:54:35 +08:00
shiziyuan9527 0a2169b09e bug fix 点击个人信息切换英文 2020-05-12 17:50:18 +08:00
q4speed f334bee3cb 去掉console.log 2020-05-12 16:37:01 +08:00
q4speed dc5fbd083b 修复固定值问题 2020-05-12 16:32:06 +08:00
q4speed 80a50999a7 Merge remote-tracking branch 'origin/dev' into dev 2020-05-12 15:27:10 +08:00
q4speed eddc19fa75 增加提取功能的JMX内容 2020-05-12 15:26:55 +08:00
shiziyuan9527 17be7deb21 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/business/components/settings/system/User.vue
2020-05-12 15:23:42 +08:00
shiziyuan9527 a05782e6c1 设置系统管理员入口 2020-05-12 15:19:40 +08:00
Captain.B d9f6e6147e i18n 2020-05-12 14:56:02 +08:00
Captain.B 34ef1be442 i18n 2020-05-12 14:44:56 +08:00
王振 158f4b2d71 fix typo 2020-05-12 11:32:49 +08:00
q4speed bc294c354c Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/i18n/zh-CN.js
2020-05-12 11:27:36 +08:00
q4speed 796f00f403 增加提取功能的页面 2020-05-12 11:25:04 +08:00
Captain.B 101401d6fc 样式 2020-05-12 11:24:38 +08:00
q4speed 3c10555c9e 修复按钮显示及禁用bug 2020-05-12 11:22:19 +08:00
shiziyuan9527 5ad9d37bda 删除无用代码 2020-05-12 11:01:56 +08:00
Captain.B 290df82611 样式 2020-05-12 10:56:41 +08:00
Captain.B f3766f3ef2 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev
 Conflicts:
	frontend/src/business/components/settings/personal/PersonSetting.vue
2020-05-12 10:55:24 +08:00
Captain.B a89052bc6e 样式 2020-05-12 10:53:51 +08:00
wenyann d7ccef6ee5 Merge remote-tracking branch 'origin/dev' into dev 2020-05-12 10:46:45 +08:00
wenyann 433bd0f8c1 密码 2020-05-12 10:46:21 +08:00
王振 833050a9ef 修改样式 2020-05-11 23:40:19 +08:00
王振 96b8c89071 修改关联测试用例弹框样式 2020-05-11 22:12:23 +08:00
BugKing 5719f67c04
Update zh-CN.js 2020-05-11 18:25:22 +08:00
shiziyuan9527 d183914eff i18n 2020-05-11 18:08:00 +08:00
Captain.B 2903d6d593 日志详情和日志下载 2020-05-11 17:29:25 +08:00
wenyann bd7841ddcc Merge remote-tracking branch 'origin/dev' into dev 2020-05-11 16:12:26 +08:00
wenyann 54a3155461 id唯一性校验 2020-05-11 16:11:55 +08:00
shiziyuan9527 0db3832e08 管理员只能修改成员角色信息 frontend 2020-05-11 15:49:17 +08:00
shiziyuan9527 dff0c8a008 修改util.js 2020-05-11 15:33:40 +08:00
shiziyuan9527 12da2509d2 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	backend/src/main/java/io/metersphere/service/UserService.java
2020-05-11 14:48:17 +08:00
shiziyuan9527 5abece2d37 优化工作空间和组织相关部分 2020-05-11 14:44:53 +08:00
q4speed 599774ef0a 修复断言背景色 2020-05-11 14:25:48 +08:00
q4speed c80344813b 修复加载问题 2020-05-11 14:25:28 +08:00
wenyann 4a958d6f44 Merge remote-tracking branch 'origin/dev' into dev 2020-05-11 14:13:16 +08:00
wenyann 8880599f29 修改密码 2020-05-11 14:12:29 +08:00
q4speed f07078fdf6 修复element ui国际化文件加载失败的bug 2020-05-11 11:48:52 +08:00
wenyann 68efed66fe Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-10 21:32:10 +08:00
chenjianxing 7883b6ff43 用例导入时显示导入中 2020-05-09 20:06:32 +08:00
chenjianxing b941ffebf5 测试用例执行人显示名称 2020-05-09 19:26:42 +08:00
chenjianxing e50241158f Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-09 19:03:35 +08:00
chenjianxing 08d3ec19ef 测试详筛选排序 2020-05-09 18:39:47 +08:00
chenjianxing f014d5267d fix 测试用例查询 2020-05-09 18:07:23 +08:00
chenjianxing 4df45d190c 测试用例筛选排序 2020-05-09 17:55:13 +08:00
wenyann a690ffecde Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev
 Conflicts:
	frontend/src/i18n/en-US.js
2020-05-09 17:40:17 +08:00
wenyann 6924832fee demo 2020-05-09 17:38:30 +08:00
q4speed 7854c999c9 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 16:03:44 +08:00
q4speed 29a78a42c7 API翻译同步 2020-05-09 16:03:30 +08:00
Captain.B 02b1f1f80b 使用operator button 2020-05-09 16:03:07 +08:00
Captain.B 3cfc37a2f7 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 15:58:36 +08:00
Captain.B 7ad65837fb 使用operator button 2020-05-09 15:44:33 +08:00
shiziyuan9527 f0427d4705 组织,工作空间管理员无法移除自身 2020-05-09 15:40:57 +08:00
q4speed c1035e00ae Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 15:33:00 +08:00
q4speed 85bf0d0ba1 修正指针形状 2020-05-09 15:31:49 +08:00
Captain.B 1a685ab202 删除不用的代码 2020-05-09 15:28:58 +08:00
q4speed efec984b90 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 14:51:51 +08:00
q4speed 2a7be35de1 API报告页面 2020-05-09 14:51:37 +08:00