Commit Graph

3656 Commits

Author SHA1 Message Date
BugKing 82aa199fd2 docs: 修改 roadmap 格式 2020-11-17 10:06:28 +08:00
BugKing 656ae4d4b5 build: 使用 COPY 命令替代 ADD 2020-11-17 09:42:04 +08:00
chenjianxing 62f32e5d38 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-16 22:06:57 +08:00
chenjianxing 23af8e25ea fix: 报告导出空白页 2020-11-16 22:06:50 +08:00
fit2-zhao 940acf3693 接口定义-基本执行方法完成 2020-11-16 20:18:14 +08:00
fit2-zhao 515c92060b 接口定义-基本执行方法完成 2020-11-16 20:14:17 +08:00
Captain.B 460d2377c5 fix: 修复设置页面图片和title的问题 2020-11-16 18:19:11 +08:00
BugKing f43a502096 docs: 修改 roadmap 格式 2020-11-16 17:14:49 +08:00
BugKing df4a44f3d5 docs: 修改 readme 格式 2020-11-16 17:09:25 +08:00
shiziyuan9527 4f140bd046 refactor: 修改flyway 2020-11-16 16:13:55 +08:00
shiziyuan9527 0ecb9870a1 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-16 16:11:42 +08:00
shiziyuan9527 1858ef5857 refactor: i18n 2020-11-16 16:10:33 +08:00
shiziyuan9527 4598c10864 feat(测试跟踪): 集成zentao 2020-11-16 16:04:11 +08:00
chenjianxing acaddcbe7a feat: 添加组织成员角色 2020-11-16 15:53:03 +08:00
shiziyuan9527 0c7acfebea refactor: 项目表增加zentao关联属性 2020-11-16 15:45:07 +08:00
shiziyuan9527 a94c8473f3 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-16 13:57:53 +08:00
fit2-zhao e9660cdeae Merge branch 'local-api-delimit' of https://github.com/metersphere/metersphere into local-api-delimit 2020-11-16 09:21:19 +08:00
chenjianxing 2c47bcc073 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-13 19:33:58 +08:00
zhao.yong ae065ae3ba 改造执行方法,放到后台处理 2020-11-13 18:40:38 +08:00
wenyann 085af5b862 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-13 17:06:51 +08:00
wenyann eba91d88d2 fix: i18n 2020-11-13 17:06:40 +08:00
shiziyuan9527 919f08431d feat: 集成zentao 2020-11-13 17:01:36 +08:00
Captain.B abd12d5d77 refactor: 下载jtl 2020-11-13 16:58:57 +08:00
Captain.B b9e79cec6e refactor(性能测试): 性能测试保存jtl 2020-11-13 16:37:56 +08:00
Captain.B f40f0bbede refactor: 下载jtl 2020-11-13 16:32:59 +08:00
Captain.B e26d3a668e refactor(性能测试): 性能测试保存jtl 2020-11-13 15:55:57 +08:00
Captain.B 28e1fb3a6f Merge remote-tracking branch 'origin/master' into master 2020-11-13 15:54:33 +08:00
Captain.B 7127f9eb3f refactor(性能测试): 性能测试保存jtl 2020-11-13 15:53:24 +08:00
wenyann d3862866fe fix: 登陆密码长度,邮箱设置 2020-11-13 14:19:14 +08:00
wenyann a94453b518 fix: 登陆密码长度,邮箱设置 2020-11-13 14:15:54 +08:00
fit2-zhao db4e528efd Merge branch 'local-api-delimit' of https://github.com/metersphere/metersphere into local-api-delimit 2020-11-13 11:27:44 +08:00
q4speed 5da28af6c5 feat(接口测试): 后端转换JMX增加场景断言 2020-11-13 11:25:19 +08:00
fit2-zhao a64723e383 Merge branch 'master' into local-api-delimit 2020-11-13 11:20:24 +08:00
q4speed 0218d3411e fix(接口测试): 修复合并分支问题 2020-11-13 11:07:15 +08:00
BugKing a680fc5779
docs: 更新 readme 图片地址 2020-11-13 10:46:51 +08:00
fit2-zhao 1a7d70a142 Merge remote-tracking branch 'remotes/origin/jmx-convert' into local-api-delimit
# Conflicts:
#	backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
#	backend/src/main/java/io/metersphere/api/dto/scenario/request/HttpRequest.java
#	frontend/src/business/components/api/test/ApiTestConfig.vue
#	frontend/src/business/components/api/test/model/ScenarioModel.js
2020-11-13 10:44:03 +08:00
fit2-zhao fccabe6311 Merge remote-tracking branch 'remotes/origin/jmx-convert' into local-api-delimit
# Conflicts:
#	backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
#	backend/src/main/java/io/metersphere/api/dto/scenario/request/HttpRequest.java
#	frontend/src/business/components/api/test/ApiTestConfig.vue
#	frontend/src/business/components/api/test/model/ScenarioModel.js
2020-11-13 10:43:37 +08:00
fit2-zhao 5005cbdd85 Merge branch 'master' into local-api-delimit
# Conflicts:
#	frontend/package.json
2020-11-13 09:43:20 +08:00
fit2-zhao a887840214 feat(接口定制): 基础保存功能完善 2020-11-13 09:38:37 +08:00
Captain.B 28aebdd2f0 fix(测试跟踪): 修复测试用例选择自动且关联用例为其他时,在测试计划中查看该用例出现问题 2020-11-12 15:26:06 +08:00
Captain.B 100798e0f2 refactor: 修改操作列的 min-width 2020-11-12 15:12:38 +08:00
BugKing f921173b60
Update README.md 2020-11-12 11:13:14 +08:00
q4speed 759e6e7f0d fix(接口测试): 修复空指针bug 2020-11-12 10:21:42 +08:00
Captain.B aee13a6df8 refactor(性能测试): 修改 dockerfile 保存jtl 2020-11-11 18:00:39 +08:00
Captain.B ecfc1d2596 feat(性能测试): 设置reportId参数 2020-11-11 17:59:05 +08:00
q4speed fecc4c4a7e refactor: 删除测试 2020-11-11 17:40:36 +08:00
q4speed 02e8b7b12b refactor(接口测试): 测试 2020-11-11 17:10:13 +08:00
q4speed b9126f282b fix(接口测试): 修复testclass和guiclass不正确的bug 2020-11-11 17:08:09 +08:00
shiziyuan9527 437630eb81 feat: zentao组件添加地址属性 2020-11-11 17:02:26 +08:00
Captain.B 67f411f583 Merge remote-tracking branch 'origin/master' into master 2020-11-11 16:03:41 +08:00