Commit Graph

2576 Commits

Author SHA1 Message Date
Captain.B
403e72393c Merge remote-tracking branch 'origin/master' into master 2020-12-03 16:44:57 +08:00
Captain.B
882c1d3b17 refactor: 消息设置页面重构 2020-12-03 16:42:40 +08:00
chenjianxing
18d2d68486 refactor: 删除多余代码 2020-12-03 16:32:27 +08:00
chenjianxing
f581a5626f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 16:28:35 +08:00
chenjianxing
3bd7a1d049 refactor(接口测试): swagger 导入重构造 2020-12-03 16:28:23 +08:00
Captain.B
3ebec6a84a refactor: 消息设置滚动条设置 2020-12-03 16:17:52 +08:00
Captain.B
30e3432d6d fix: 修复左上角的logo的样式 2020-12-03 15:23:20 +08:00
fit2-zhao
ade3fe2043 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 13:50:53 +08:00
fit2-zhao
c967e59511 feat(接口自动化): 完成场景自定义标签 2020-12-03 13:50:11 +08:00
Captain.B
da6d7044e3 chore: Sync submodule 2020-12-03 13:27:10 +08:00
Captain.B
f2d0f87724 Merge branch 'master' into notice-refactor 2020-12-03 12:50:41 +08:00
Captain.B
22a0a94613 refactor: 重构发送通知 2020-12-03 12:46:02 +08:00
fit2-zhao
b7a472a08c Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-02 19:23:05 +08:00
fit2-zhao
77a1724bc7 feat(接口自动化): 场景自动化基本画面完成 2020-12-02 19:22:58 +08:00
q4speed
7ee2374b00 refactor(接口自动化): 修改全选 2020-12-02 18:23:26 +08:00
q4speed
02a5eb9570 fix(接口自动化): 修复点击模块不能正确更新场景列表的bug 2020-12-02 15:48:47 +08:00
fit2-zhao
0450186735 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-02 15:34:58 +08:00
q4speed
4065663f55 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
#	frontend/src/business/components/api/automation/ApiAutomation.vue
#	frontend/src/i18n/zh-CN.js
2020-12-02 15:34:04 +08:00
fit2-zhao
c90789e48c feat(接口自动化): 场景自动化基本画面完成 2020-12-02 15:34:00 +08:00
q4speed
9e600dab94 feat(接口自动化): 场景列表 2020-12-02 15:32:16 +08:00
fit2-zhao
4e12976dfd fix(接口定义): 统一id 方便后续引用 2020-12-02 14:31:53 +08:00
fit2-zhao
d571c9dc07 fix(接口定义): http 协议headers 收入到请求中 2020-12-02 14:21:17 +08:00
chenjianxing
529b003c2b Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-01 21:07:39 +08:00
chenjianxing
b08775dbb9 feat(接口测试): 接口定义导入 2020-12-01 21:07:32 +08:00
fit2-zhao
1a576c40b8 feat(接口自动化): 基础交互完成 2020-12-01 19:30:10 +08:00
fit2-zhao
184b7ca3f4 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-01 17:49:17 +08:00
fit2-zhao
184cd9659c feat(接口自动化): 创建场景 2020-12-01 17:49:09 +08:00
fit2-zhao
f62ae2bd59 fix(接口定义): 自动生成代码规范修改 2020-12-01 17:47:39 +08:00
shiziyuan9527
439cf3b89b refactor(测试跟踪): 用例评审查询优化 2020-12-01 15:00:30 +08:00
Captain.B
44e21cea8f fix: 修复display引入的问题 2020-12-01 13:23:23 +08:00
Captain.B
3a16942876 fix: 修复display引入的问题 2020-12-01 13:20:05 +08:00
Captain.B
605e308159 refactor: 消息通知页面修改 2020-12-01 11:00:46 +08:00
Captain.B
e1eef7ee41 Merge remote-tracking branch 'origin/master' into master 2020-12-01 10:44:38 +08:00
Captain.B
4c38f01243 chore: Sync submodule 2020-12-01 10:44:18 +08:00
chenjianxing
65c0bf3f32 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-01 10:38:44 +08:00
chenjianxing
80fa0ab394 refactor(测试跟踪): 重构测试跟踪详情 2020-12-01 10:38:36 +08:00
Captain.B
3975954e35 Merge branch 'v1.5' into master 2020-12-01 10:31:36 +08:00
Captain.B
b7fb3cc8ec fix: 修复关闭rpsLimit时,不输入rpsLimit无法保存的问题
Closes #839
2020-12-01 10:29:57 +08:00
Captain.B
705de64835 Merge branch 'v1.5' into master 2020-12-01 10:15:04 +08:00
Captain.B
4a26b3baf6 fix(性能测试): 去掉input中的placeholder
Closes #838
2020-12-01 10:14:06 +08:00
Captain.B
edab268a4c Merge branch 'v1.5' into master 2020-12-01 10:00:11 +08:00
Captain.B
9b975c54d0 Merge remote-tracking branch 'origin/master' into master 2020-11-30 18:17:08 +08:00
Captain.B
1ba7a8365b refactor: 显示设置调整位置,提供hasLicense函数处理v-pack失效的问题 2020-11-30 18:16:53 +08:00
shiziyuan9527
3c05506204 refactor(系统设置): 调整缺陷管理平台图标大小 2020-11-30 17:57:15 +08:00
Captain.B
5491eac52e refactor: 增加一个v-xpack指令 2020-11-30 17:41:51 +08:00
fit2-zhao
4facb91b34 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-30 17:22:06 +08:00
fit2-zhao
388d9850a2 fix(接口定义): 校验调整 2020-11-30 17:21:47 +08:00
shiziyuan9527
6ed65e22d3 refactor(测试跟踪): 优化查询 2020-11-30 16:40:02 +08:00
shiziyuan9527
834baeac31 Merge branch 'refector' 2020-11-30 14:59:37 +08:00
fit2-zhao
b9fc0c8195 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-30 14:30:08 +08:00