Commit Graph

591 Commits

Author SHA1 Message Date
Captain.B 3cfc37a2f7 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 15:58:36 +08:00
Captain.B 7ad65837fb 使用operator button 2020-05-09 15:44:33 +08:00
shiziyuan9527 f0427d4705 组织,工作空间管理员无法移除自身 2020-05-09 15:40:57 +08:00
q4speed c1035e00ae Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 15:33:00 +08:00
q4speed 85bf0d0ba1 修正指针形状 2020-05-09 15:31:49 +08:00
Captain.B 1a685ab202 删除不用的代码 2020-05-09 15:28:58 +08:00
q4speed efec984b90 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 14:51:51 +08:00
q4speed 2a7be35de1 API报告页面 2020-05-09 14:51:37 +08:00
Captain.B f3c04ce4eb Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-05-09 13:23:37 +08:00
wenyann 6012004200 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 12:08:06 +08:00
wenyann 998134b1f1 修改用户密码 2020-05-09 12:06:09 +08:00
chenjianxing 18e2cc8960 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-09 11:36:19 +08:00
chenjianxing de3faf3ca5 用例模块等允许带空格 2020-05-09 11:36:01 +08:00
shiziyuan9527 0752a0c54b 修改个人信息 2020-05-09 11:05:03 +08:00
Captain.B 74075ddefc 样式 2020-05-09 11:01:09 +08:00
wenyann 43e5381a22 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 10:52:10 +08:00
chenjianxing 366ae5e95c 更新最近计划 2020-05-09 10:44:15 +08:00
chenjianxing e20f091f7a fix 模版编辑 2020-05-09 09:33:53 +08:00
chenjianxing 7dbd070736 浏览器回退,遮罩层无法关闭 2020-05-08 19:25:05 +08:00
wenyann b5760cd2b4 性能测试样式修改 2020-05-08 19:09:09 +08:00
chenjianxing 90c2e0d1f5 测试报告模版 2020-05-08 18:54:47 +08:00
chenjianxing 845439661e date picker 2020-05-08 18:43:12 +08:00
Captain.B 841019d4a7 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev
 Conflicts:
	frontend/src/i18n/zh-CN.js
2020-05-08 18:03:34 +08:00
Captain.B 843d7ed3b1 日志下载 2020-05-08 18:02:58 +08:00
wenyann b8f10e2ea0 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-08 17:42:03 +08:00
shiziyuan9527 bd023c1f27 修改Dialog按钮 2020-05-08 17:21:58 +08:00
wenyann 62ee448245 demo 2020-05-08 17:19:28 +08:00
chenjianxing 45ac65da59 报告图表 2020-05-08 17:06:29 +08:00
shiziyuan9527 6dc6cc8459 修改方法命名 2020-05-08 16:05:01 +08:00
chenjianxing b876ca0acc Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-08 15:59:44 +08:00
chenjianxing 48a6ae3952 测试报告组件编辑 2020-05-08 15:59:03 +08:00
shiziyuan9527 7d586af28b 优化代码 2020-05-08 15:34:45 +08:00
chenjianxing cff0b05b32 获取测试报告数据 2020-05-08 14:06:33 +08:00
shiziyuan9527 d38fe65d2b 优化代码 2020-05-08 12:11:02 +08:00
q4speed ae288e8ace Merge remote-tracking branch 'origin/dev' into dev 2020-05-08 11:04:19 +08:00
q4speed 6745d8b5fc 修复key value不能正确显示的问题 2020-05-08 11:04:04 +08:00
chenjianxing 2a3b1a2036 导航栏样式 2020-05-08 00:38:26 +08:00
chenjianxing e5e7737f29 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-08 00:23:12 +08:00
chenjianxing c5fb011819 uuid 2020-05-08 00:22:35 +08:00
q4speed b5e7b74633 Merge remote-tracking branch 'origin/dev' into dev 2020-05-08 00:00:05 +08:00
q4speed 39aed31aa5 生成report 2020-05-07 23:59:51 +08:00
shiziyuan9527 775950ec02 修改按钮 2020-05-07 18:03:22 +08:00
shiziyuan9527 f36c375467 阻止按钮回车事件 2020-05-07 16:03:40 +08:00
shiziyuan9527 74c8be756a 代码优化 2020-05-07 14:35:56 +08:00
Captain.B 02ab2f230a Merge remote-tracking branch 'origin/dev' into dev 2020-05-07 13:37:22 +08:00
Captain.B 17c8a98f56 修改资源池状态 2020-05-07 13:37:05 +08:00
shiziyuan9527 dee5790ae7 i18n 2020-05-07 11:37:39 +08:00
王振 dae2f9c41c 修改移动用例弹框文本 2020-05-07 11:19:45 +08:00
chenjianxing d0ebd18be5 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-06 20:29:57 +08:00
chenjianxing d511800cc8 查看编辑测试用例报告 2020-05-06 20:29:41 +08:00