Commit Graph

1647 Commits

Author SHA1 Message Date
chenjianxing 6944f99814 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-11 11:54:56 +08:00
shiziyuan9527 20a0fa0fcc 删除资源池前进行检查 2020-06-11 11:44:52 +08:00
chenjianxing 0d27c0610a 菜单栏样式 2020-06-11 11:43:39 +08:00
shiziyuan9527 781effee73 下拉选择用户时,显示用户ID和邮箱 2020-06-11 10:52:33 +08:00
Captain.B e8d2ca6f33 Merge remote-tracking branch 'origin/dev' into dev 2020-06-11 10:41:27 +08:00
Captain.B 6560a87bd6 去掉dns cache 2020-06-11 10:39:09 +08:00
wenyann 3ef9d6bdd4 '' 2020-06-11 10:12:27 +08:00
chenjianxing 181c843367 删除无用代码 2020-06-10 19:06:14 +08:00
chenjianxing 49b2feea40 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-10 19:05:13 +08:00
chenjianxing 115e545181 只读用户权限问题 2020-06-10 19:04:48 +08:00
Captain.B 6694f45c17 rollback 2020-06-10 16:47:33 +08:00
wenyann 772e2b108c '接口测试,性能测试首页报告状态' 2020-06-10 16:37:01 +08:00
shiziyuan9527 c2f91a140e 校验资源池服务器是否可用时,添加超时限制 2020-06-10 16:21:40 +08:00
Captain.B 302d4ea5a3 每次刷新页面的时候重新put session user 2020-06-10 16:17:29 +08:00
Captain.B 0065f15f60 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-06-10 14:09:58 +08:00
chenjianxing 5fd03f1f54 测试日历显示问题 2020-06-10 13:47:05 +08:00
chenjianxing 3a9763ed82 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-10 11:12:32 +08:00
chenjianxing 247bb88666 资源池启用校验优化 2020-06-10 11:11:38 +08:00
wenyann 259031831d Merge remote-tracking branch 'origin/dev' into dev 2020-06-10 11:00:34 +08:00
wenyann be8ab4681f '' 2020-06-10 11:00:12 +08:00
chenjianxing 4f13120d31 测试计划详情添加报告按钮 2020-06-10 10:31:01 +08:00
chenjianxing 7e6fecc09f 性能测试跳转刷新 2020-06-10 10:01:04 +08:00
chenjianxing 354e3f9907 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-10 09:22:24 +08:00
王振 50cb5cbb16 Merge branch 'master' into dev 2020-06-09 21:44:40 +08:00
王振 9e55ecba5b update readme 2020-06-09 21:44:22 +08:00
shiziyuan9527 bf7bedef9c fix Safari 表格字段错位 2020-06-09 16:52:55 +08:00
王振 2b681f396f 更换 logo 图片 2020-06-09 15:26:19 +08:00
Captain.B 26079198e1 get user 2020-06-09 15:18:40 +08:00
q4speed 129a602e00 Merge remote-tracking branch 'origin/dev' into dev 2020-06-09 15:18:26 +08:00
q4speed bc5f527364 修复响应时间断言输入框在删光字符后消失的bug 2020-06-09 15:18:12 +08:00
shiziyuan9527 990076e74f Safari下字段名称显示过长问题 2020-06-09 14:59:15 +08:00
王振 d46a622f82 Merge branch 'master' into dev 2020-06-09 14:19:52 +08:00
王振 d27dd8948e update readme 2020-06-09 14:19:20 +08:00
q4speed 92d10d6c8e NaN 2020-06-09 11:14:52 +08:00
q4speed 6cb11c5fb7 修改sql,去掉大小写区分 2020-06-09 10:56:04 +08:00
q4speed 868e3316b0 Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-06-09 10:46:26 +08:00
chenjianxing 5bb2e223a8 接口测试首页刷新 2020-06-09 10:16:50 +08:00
wenyann e7d0ab6479 Merge remote-tracking branch 'origin/dev' into dev 2020-06-08 19:02:43 +08:00
wenyann 5d8581eac6 '默认设置' 2020-06-08 19:02:18 +08:00
shiziyuan9527 ae77df2ae3 用户排序 2020-06-08 18:18:11 +08:00
王振 f1e4cb8d92 Merge branch 'dev' of github.com:metersphere/metersphere into dev 2020-06-08 17:50:16 +08:00
王振 82c0d658f2 update i18n 2020-06-08 17:49:42 +08:00
wenyann b53f07cae6 Merge remote-tracking branch 'origin/dev' into dev 2020-06-08 17:45:59 +08:00
wenyann 2181ef42ae '去除弹出保存用户名密码弹框' 2020-06-08 17:45:32 +08:00
shiziyuan9527 016e20ba60 性能测试首页,测试和报告交换位置 2020-06-08 17:12:33 +08:00
chenjianxing 8333367ca0 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-08 16:34:23 +08:00
chenjianxing af481eb14a 用例导入对话框大小 2020-06-08 16:34:01 +08:00
Captain.B 2a8fab75f0 去掉没有用到的代码 2020-06-08 16:15:13 +08:00
Captain.B cc7efe9497 Merge remote-tracking branch 'origin/dev' into dev 2020-06-08 16:10:25 +08:00
Captain.B b130c1ffa4 修复sql报错 2020-06-08 16:08:59 +08:00