Commit Graph

596 Commits

Author SHA1 Message Date
Captain.B e9e27f4211 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	backend/pom.xml
2020-04-16 10:57:10 +08:00
Captain.B b7ae9c5e08 report 2020-04-16 10:56:22 +08:00
chenjianxing 3634544ae2 fix 测试用例导入 2020-04-16 10:35:53 +08:00
chenjianxing 7dba9bea5f Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-15 18:33:14 +08:00
chenjianxing d65c129f3a 导出模版 2020-04-15 18:32:57 +08:00
q4speed 155b340e11 Merge remote-tracking branch 'origin/dev' into dev 2020-04-15 18:25:50 +08:00
q4speed f9f1809f3e api界面,未完待续 2020-04-15 18:25:34 +08:00
chenjianxing 98379ac9e1 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-15 16:58:28 +08:00
chenjianxing 276961d97b 测试用例导入 2020-04-15 16:58:04 +08:00
shiziyuan9527 c39c0cc3c5 Merge remote-tracking branch 'origin/dev' into dev 2020-04-15 14:52:56 +08:00
shiziyuan9527 d943d41829 修改测试概览图表 2020-04-15 14:52:38 +08:00
Captain.B 5db5974cc4 enum add status saved 2020-04-15 14:48:58 +08:00
Captain.B 44549ee5b6 enum add status saved 2020-04-15 14:34:15 +08:00
Captain.B 5753a391a2 run test error changed 2020-04-15 14:20:26 +08:00
Captain.B 7dffef5379 run test error 2020-04-15 13:55:54 +08:00
shiziyuan9527 983218d7b0 Merge remote-tracking branch 'origin/dev' into dev 2020-04-14 15:07:23 +08:00
shiziyuan9527 12512357c5 修改报告持续时间 2020-04-14 15:06:55 +08:00
Captain.B 2797786e46 test 2020-04-14 14:57:10 +08:00
Captain.B eead5f2e3f Merge remote-tracking branch 'origin/dev' into dev 2020-04-13 19:04:45 +08:00
Captain.B 78b757302f 分开保存结果 2020-04-13 17:39:28 +08:00
shiziyuan9527 3163cc1b14 修改测试概览Max Users 2020-04-13 17:35:33 +08:00
Captain.B 7ba0e97125 saveLocalStorage 2020-04-13 11:03:09 +08:00
Captain.B 336b6c4af6 status 2020-04-13 10:28:00 +08:00
Captain.B 45f4ac0193 style 2020-04-11 15:10:38 +08:00
shiziyuan9527 0a223f14ed 修改性能测试状态 2020-04-10 18:05:33 +08:00
shiziyuan9527 1578329cec 修改分页 2020-04-10 17:59:04 +08:00
shiziyuan9527 6948f4042d 修改分页 2020-04-10 17:46:50 +08:00
q4speed 1788e22351 Merge remote-tracking branch 'origin/dev' into dev 2020-04-10 16:23:53 +08:00
q4speed a116bfe8ab 统一表格分页样式 2020-04-10 16:23:38 +08:00
shiziyuan9527 e9d3876264 修改样式 2020-04-10 14:59:23 +08:00
shiziyuan9527 7d6b494b46 修改报告持续时间 2020-04-10 14:44:09 +08:00
Captain.B 22e809bbae chart width 100% 2020-04-10 14:19:14 +08:00
chenjianxing 41a9fcfcf2 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-10 13:57:19 +08:00
chenjianxing 6894ee679a fix 项目查询 2020-04-10 13:56:57 +08:00
Captain.B 53fb702214 Merge remote-tracking branch 'origin/dev' into dev 2020-04-10 12:32:40 +08:00
Captain.B 5cf402181c 禁止修改创建时间 2020-04-10 12:32:25 +08:00
chenjianxing 117fc81343 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-10 12:00:26 +08:00
chenjianxing b8296dbff9 修改样式 2020-04-10 12:00:15 +08:00
Captain.B b4cc48f1ed 禁止修改创建时间 2020-04-10 11:54:05 +08:00
Captain.B d4c33c53f6 btn 禁用事件 2020-04-10 11:50:09 +08:00
Captain.B 2d17d227eb 部分查询 2020-04-10 11:36:18 +08:00
Captain.B ed9d972bee 页面上的部分查询 2020-04-10 11:25:42 +08:00
Captain.B c3738739ba 部分查询 2020-04-10 11:17:04 +08:00
Captain.B 2a2690e00b Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev
 Conflicts:
	frontend/src/business/components/settings/system/Organization.vue
2020-04-10 11:16:44 +08:00
Captain.B 9120825caa 页面上的部分查询 2020-04-10 11:14:11 +08:00
shiziyuan9527 271304bc52 添加按钮onkeydown事件 2020-04-10 10:57:34 +08:00
Captain.B 026a03c21d btn block keydown event 2020-04-10 10:29:44 +08:00
Captain.B af04f5974d btn block keydown event 2020-04-10 10:28:52 +08:00
Captain.B 4f88cc20f0 style 2020-04-10 10:00:54 +08:00
Captain.B 42b93d04b8 Merge remote-tracking branch 'origin/dev' into dev 2020-04-09 19:27:55 +08:00