Commit Graph

875 Commits

Author SHA1 Message Date
chenjianxing
82cc66dbcd feat: 接口测试支持导入插件录制json格式 2020-07-16 13:10:52 +08:00
Captain.B
4018235aaa Merge branch 'master' of github.com:fit2cloudrd/metersphere-server 2020-07-16 09:49:00 +08:00
chenjianxing
942707ab64 Merge branch 'master' of https://github.com/metersphere/server 2020-07-15 20:45:46 +08:00
chenjianxing
bfa01c09e9 fix: 修复接口测试落干bug 2020-07-15 20:45:33 +08:00
shiziyuan9527
b5f471c67d feat: 测试用例列表添加ID展示列 2020-07-15 18:52:46 +08:00
Captain.B
2a759ca848 refactor: 去掉警告 2020-07-15 17:54:46 +08:00
shiziyuan9527
15c75c4fda fix: 修复升级 mybatis-generator-plugin 中的 mysql-connector 版本造成没有识别主键的bug 2020-07-15 16:46:18 +08:00
q4speed
1aac4684dd refactor: 去警告 2020-07-15 16:08:51 +08:00
chenjianxing
ddf4d7f938 Merge branch 'master' of https://github.com/metersphere/server 2020-07-15 15:35:49 +08:00
chenjianxing
685da4ccef feat: Swagger2 导入接口测试 2020-07-15 15:35:36 +08:00
wenyann
b15d35558f Merge remote-tracking branch 'origin/master' 2020-07-15 10:41:12 +08:00
wenyann
1d5fb3f3ff style: 调整代码格式 2020-07-15 10:40:43 +08:00
q4speed
fdc7db695d refactor: 优化 2020-07-15 10:25:52 +08:00
shiziyuan9527
c3e32f2df8 refactor: 检查测试用例是否关联测试 2020-07-14 21:52:10 +08:00
shiziyuan9527
5cc3755dcd fix: 用户登录问题 2020-07-14 20:58:52 +08:00
Captain.B
cd9f39c8b1 Merge remote-tracking branch 'origin/master' 2020-07-14 18:37:05 +08:00
Captain.B
2da491a287 fix: 修复用户登录报错无法显示到页面上的 bug 2020-07-14 18:36:51 +08:00
shiziyuan9527
ccaf3db2a6 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-14 17:29:40 +08:00
shiziyuan9527
0c9badda9c fix: LDAP用户登录问题 2020-07-14 17:28:53 +08:00
Captain.B
a483732635 Merge remote-tracking branch 'origin/master' 2020-07-14 17:27:04 +08:00
Captain.B
46586e7da6 fix: 修复jmx只有线程组没有采样器导致无法收到消息的bug 2020-07-14 17:23:32 +08:00
BugKing
f6e30833de
Merge pull request #75 from metersphere/dependabot/maven/backend/mysql-mysql-connector-java-8.0.16
chore: Bump mysql-connector-java from 5.1.41 to 8.0.16 in /backend
2020-07-14 15:53:14 +08:00
shiziyuan9527
327e06f0b7 style: 修改用户来源标识 2020-07-14 15:36:17 +08:00
shiziyuan9527
9045102e21 feat: 新建用户时设置用户来源 2020-07-14 14:46:40 +08:00
Captain.B
3f41704583 refactor: 去掉DEBUG中的SQL日志 2020-07-14 13:42:09 +08:00
wenyann
339e1e243b Merge remote-tracking branch 'origin/master' 2020-07-14 11:28:48 +08:00
wenyann
567f217566 fix: 修改用例步骤拼接,格式 2020-07-14 11:27:06 +08:00
wenyann
bac151be1e 用例步骤换行 2020-07-14 11:10:36 +08:00
shiziyuan9527
f9b2cdc20d feat: LDAP设置中支持多个OU 2020-07-14 11:05:01 +08:00
wenyann
686baea129 Merge remote-tracking branch 'origin/master' 2020-07-14 10:15:47 +08:00
wenyann
cd60ef9be8 测试用例导出 2020-07-14 10:15:11 +08:00
shiziyuan9527
b9c369ec5c feat: 关联测试用例页面添加高级搜索 2020-07-13 21:25:45 +08:00
q4speed
faad7895e9 Merge remote-tracking branch 'origin/master' 2020-07-13 16:05:14 +08:00
q4speed
c715a96cb7 高级查询 2020-07-13 16:05:01 +08:00
shiziyuan9527
71085aa54c sql 2020-07-13 10:43:51 +08:00
shiziyuan9527
98eeb7bc2e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-13 10:31:52 +08:00
shiziyuan9527
2bd46f80b4 新建用户时设置用户来源 2020-07-13 10:31:14 +08:00
shiziyuan9527
8199fbbf5f ldap设置中支持多个OU 2020-07-10 17:32:01 +08:00
q4speed
7e40811443 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-10 16:44:03 +08:00
shiziyuan9527
aca19f6dfa 通过ldap登录的用户不能修改密码和邮箱 2020-07-10 16:27:41 +08:00
q4speed
5a377843d9 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	frontend/src/i18n/en-US.js
	frontend/src/i18n/zh-CN.js
	frontend/src/i18n/zh-TW.js
2020-07-10 10:47:56 +08:00
q4speed
506ad9f5f0 统一状态 2020-07-10 10:43:33 +08:00
shiziyuan9527
6cf137f777 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-09 15:09:32 +08:00
shiziyuan9527
e71e866827 测试计划关联用例页增加按用例名称搜索 2020-07-09 15:09:05 +08:00
chenjianxing
cf9cffb114 Merge branch 'master' of https://github.com/metersphere/server 2020-07-09 15:09:01 +08:00
chenjianxing
23c8f9a8ea merge v1.0 2020-07-09 15:08:37 +08:00
shiziyuan9527
0228043184 测试计划关联用例增加优先级和类型并支持筛选 2020-07-09 14:17:05 +08:00
Captain.B
39121f0f99 shiro config 配置 2020-07-09 14:09:59 +08:00
chenjianxing
458583ce1f Swagger导入相关 2020-07-09 11:39:05 +08:00
wenyann
c52f7abeb0 Merge remote-tracking branch 'origin/master' 2020-07-09 11:24:22 +08:00