Commit Graph

3689 Commits

Author SHA1 Message Date
Captain.B 4f93da8907 Merge branch 'v1.5' into master
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-11-25 16:49:52 +08:00
Captain.B 245da1d1ca fix: 修复显示设置加载图片的问题 2020-11-25 16:49:20 +08:00
Captain.B ae1b31bbfc fix: 修复显示设置加载图片的问题 2020-11-25 16:40:39 +08:00
Captain.B 0ffe1cc414 Merge remote-tracking branch 'origin/master' into master 2020-11-25 16:39:27 +08:00
Captain.B 756c8d3fff Merge branch 'v1.5' into master
# Conflicts:
#	frontend/src/business/components/xpack
2020-11-25 16:39:14 +08:00
Captain.B 17142dc4b3 fix: 修复显示设置加载图片的问题 2020-11-25 16:38:31 +08:00
shiziyuan9527 45a7a05c14 fix(用例评审): 修复只读用户可以给用例评审加评论的问题 2020-11-25 16:23:53 +08:00
fit2-zhao efcf49537f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-25 15:46:10 +08:00
fit2-zhao 9d1350a97b fix(测试跟踪): 修复 xmind 导入备注缺失问题 2020-11-25 15:45:52 +08:00
wenyann d87aad20b1 Merge remote-tracking branch 'origin/master' 2020-11-25 15:42:01 +08:00
wenyann 4bd6c8ec71 fix: 修复输入项目名称,点击enter键,项目没有创建成功,页面没有提示
Closes 819
2020-11-25 15:38:58 +08:00
Captain.B dcfb7a687a fix: 修复显示设置字数没有限制的问题 2020-11-25 15:26:15 +08:00
shiziyuan9527 1c635c4617 refactor(系统设置): 修改用户ID长度限制 2020-11-25 15:04:19 +08:00
BugKing 4122a81100 refactor: 去掉不必要的注释 2020-11-25 14:09:29 +08:00
BugKing b4a517c4ff style: 修改代码格式 2020-11-25 13:48:40 +08:00
BugKing 2543618ace Merge branch 'v1.5' into master 2020-11-25 13:44:57 +08:00
BugKing f4a3900439 docs: 修改英文 readme 格式 2020-11-25 13:44:29 +08:00
shiziyuan9527 e43ce4fa0a fix(系统设置): 修复创建用户时电话号码不支持199段的问题
Closes 818
2020-11-25 11:26:09 +08:00
BugKing 7b5dd9c14f refactor: 修改版本号 2020-11-25 11:15:29 +08:00
chenjianxing 754f067cdd refactor: 完善日志打印 2020-11-25 10:36:30 +08:00
chenjianxing 83daf96f01 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-25 10:18:06 +08:00
chenjianxing 76e0991067 fix: 登入过期,提示报错 2020-11-25 10:17:57 +08:00
wenyann fe7b1abdac Merge remote-tracking branch 'origin/master' 2020-11-25 10:13:28 +08:00
wenyann 18c810178a fix: 修复账号不一致,更新不发送,时间问题 2020-11-25 10:13:05 +08:00
Captain.B ece7b9ebb8 Merge remote-tracking branch 'origin/master' into master 2020-11-25 09:40:11 +08:00
Captain.B 0bd6599d36 Merge branch 'v1.5' into master 2020-11-25 09:39:55 +08:00
chenjianxing 592052ca43 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-24 19:44:11 +08:00
chenjianxing fbf6b59425 fix: 修复带长度限制的文本框样式 2020-11-24 19:44:04 +08:00
chenjianxing cbf889831b refactor(接口测试): 数据库配置检验 2020-11-24 19:01:55 +08:00
Captain.B 4a0c640aee refactor: 邮件配置匿名改成免密 2020-11-24 18:33:59 +08:00
Captain.B ed45152263 Merge remote-tracking branch 'origin/master' into master 2020-11-24 18:13:55 +08:00
Captain.B 06820c0af1 Merge branch 'v1.5' into master 2020-11-24 18:13:37 +08:00
Captain.B a9ff93841b fix: 修复MailService不支持非SSL的SMTP邮件服务器
Closes #768
2020-11-24 18:04:59 +08:00
shiziyuan9527 66561c5c71 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-24 17:54:43 +08:00
shiziyuan9527 a1aced7435 refactor: 删除无用代码 2020-11-24 17:53:03 +08:00
chenjianxing fa517ea34d fix(接口测试): jsonpath 推荐缺少部分字段 2020-11-24 17:51:21 +08:00
chenjianxing ed26d25ac7 refacotr(测试跟踪): 删除测试计划提示 2020-11-24 17:14:29 +08:00
chenjianxing 91e111a3e9 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-24 15:54:51 +08:00
chenjianxing d3ceb8ff5f fix(接口测试): jar包描述错别字 2020-11-24 15:48:34 +08:00
Captain.B dbba491d44 Merge remote-tracking branch 'origin/master' into master 2020-11-24 14:37:10 +08:00
Captain.B b3f321af74 Merge branch 'v1.5' into master 2020-11-24 14:36:54 +08:00
chenjianxing d02f530538 fix(接口测试): 请求体取消自动格式化 2020-11-24 14:36:15 +08:00
Captain.B de786f42f9 fix: 修复创建测试计划时重复提交,成功创建多个相同的计划 2020-11-24 14:35:19 +08:00
chenjianxing 8e4ada8e18 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-24 13:32:21 +08:00
chenjianxing 6bdb76d719 fix(接口测试): 测试报告展示顺序 2020-11-24 13:32:03 +08:00
Captain.B c4af2d57df Merge branch 'v1.5' into master 2020-11-24 13:31:02 +08:00
Captain.B 848a9481f8 fix(性能测试): 线程数不能小于资源池节点数 2020-11-24 13:30:32 +08:00
Captain.B 7be21db324 fix(性能测试): 线程数不能小于资源池节点数 2020-11-24 13:30:12 +08:00
Captain.B b013b8b790 Merge remote-tracking branch 'origin/master' into master 2020-11-24 10:50:23 +08:00
Captain.B a1b37a3c53 perf: 优化测试用例每页显示速度 2020-11-24 10:50:03 +08:00