Commit Graph

1396 Commits

Author SHA1 Message Date
chenjianxing ef4f372c08 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-19 18:20:57 +08:00
q4speed b377d398ab 修复场景名显示null的bug 2020-05-19 18:10:00 +08:00
chenjianxing 8c4afc465b Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-19 18:09:57 +08:00
chenjianxing 4cbed26f30 fix 节点拖拽 2020-05-19 18:09:44 +08:00
q4speed d94f031a12 Merge remote-tracking branch 'origin/dev' into dev 2020-05-19 17:48:28 +08:00
q4speed c1eb7cc3fe 名字做链接 2020-05-19 17:47:50 +08:00
Captain.B fcc35cccbf Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-05-19 16:44:20 +08:00
shiziyuan9527 b65e327588 删除无用代码 2020-05-19 16:32:16 +08:00
shiziyuan9527 dbf0c4fd08 Merge remote-tracking branch 'origin/dev' into dev 2020-05-19 16:27:54 +08:00
shiziyuan9527 cbf4c3a8cc 系统用户列表角色列 2020-05-19 16:27:40 +08:00
chenjianxing 9271305038 国际化 2020-05-19 16:13:51 +08:00
chenjianxing a98535ecea merge 2020-05-19 16:02:25 +08:00
chenjianxing cd52993e24 表头国际化 2020-05-19 15:56:05 +08:00
Captain.B f91f0cc91a role 去掉下划线 2020-05-19 15:21:19 +08:00
Captain.B f0853e4c4d label width 2020-05-19 15:17:21 +08:00
shiziyuan9527 037e75053c 系统用户列表修改 2020-05-19 14:34:11 +08:00
q4speed f7d1ce5fa3 Merge remote-tracking branch 'origin/dev' into dev 2020-05-19 14:26:30 +08:00
q4speed cc4b5015d1 所属测试 2020-05-19 14:26:18 +08:00
shiziyuan9527 4be23ee265 修改样式 2020-05-19 14:08:04 +08:00
shiziyuan9527 b1de405457 i18n 2020-05-19 11:39:34 +08:00
q4speed b9b5c6eb8e Merge remote-tracking branch 'origin/dev' into dev 2020-05-19 11:11:41 +08:00
q4speed 0a78845eb1 修复正则bug 2020-05-19 11:11:29 +08:00
Captain.B df14618621 js 里的属性使用 computed 国际化, 不能放在 data 里 2020-05-19 10:05:05 +08:00
chenjianxing 81922206ca Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-18 17:33:29 +08:00
chenjianxing d030b9ee8b 修复样式 2020-05-18 17:32:48 +08:00
q4speed 9d03bc48d4 缩小日历 2020-05-18 17:01:42 +08:00
q4speed 9e703f10b3 v-else 2020-05-18 16:54:48 +08:00
q4speed 86034d4e74 Merge remote-tracking branch 'origin/dev' into dev 2020-05-18 16:48:55 +08:00
q4speed a4dfcf3f09 修改报告按钮显示条件 2020-05-18 16:46:55 +08:00
Captain.B 6262c9c26f Merge remote-tracking branch 'origin/dev' into dev 2020-05-18 16:42:11 +08:00
Captain.B af8e42351b bug fix 2020-05-18 16:41:53 +08:00
shiziyuan9527 84a3887d72 退出清空Storage 2020-05-18 16:41:28 +08:00
Captain.B 92dad7b483 :gutter="20" 2020-05-18 16:12:10 +08:00
Captain.B 38ea45e9cc bug fix 2020-05-18 16:10:52 +08:00
Captain.B 89dc2bf75a Merge remote-tracking branch 'origin/dev' into dev 2020-05-18 16:06:48 +08:00
Captain.B a2dca5cb61 bug fix 2020-05-18 16:06:31 +08:00
chenjianxing 3870a81222 校验信息国际化 2020-05-18 16:05:47 +08:00
q4speed 33977c94bd Merge remote-tracking branch 'origin/dev' into dev 2020-05-18 16:03:00 +08:00
q4speed b92cd0bedb 修复路由问题 2020-05-18 16:02:47 +08:00
Captain.B 17d627afe9 Merge remote-tracking branch 'origin/dev' into dev 2020-05-18 15:51:29 +08:00
Captain.B ba3fe5a1ab i18n 2020-05-18 15:51:13 +08:00
chenjianxing 306e34494c JSR-303校验国际化 2020-05-18 15:48:16 +08:00
q4speed 2c72992390 修复路由问题 2020-05-18 15:45:11 +08:00
q4speed 7991950025 Merge remote-tracking branch 'origin/dev' into dev 2020-05-18 15:32:44 +08:00
q4speed bb7d818a33 修复测试关联报告查询错误的bug
首页增加测试日历功能
2020-05-18 15:32:20 +08:00
Captain.B 515dc1cf3d status 2020-05-18 15:13:02 +08:00
q4speed d80976f56a Merge remote-tracking branch 'origin/dev' into dev 2020-05-18 14:52:07 +08:00
q4speed c0e01074c3 增加测试关联到报告的功能 2020-05-18 14:51:53 +08:00
Captain.B a168f9e17a loading 2020-05-18 14:48:25 +08:00
Captain.B 7638513556 heatmap 2020-05-18 14:45:11 +08:00