Commit Graph

1070 Commits

Author SHA1 Message Date
chenjianxing 0147fe152a 测试计划-编辑测试用例后保留搜索条件 2020-05-14 12:43:43 +08:00
chenjianxing 479dd28d05 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-14 11:53:31 +08:00
chenjianxing 2957e5acef 饼图样式 2020-05-14 11:53:14 +08:00
chenjianxing 2b3e148463 重命名节点更新模块字段 2020-05-14 11:41:45 +08:00
Captain.B d082ebc7d2 zh-tw 2020-05-14 11:34:15 +08:00
Captain.B e0fb95f461 zh_TW 2020-05-14 11:28:50 +08:00
chenjianxing d569ef8582 解决面包屑key重复 2020-05-14 10:09:04 +08:00
chenjianxing 8c286795f7 拖拽节点更新模块字段 2020-05-14 09:34:11 +08:00
shiziyuan9527 a8dd83b3cc i18n 2020-05-13 18:12:15 +08:00
Captain.B e7f854cd1f Merge remote-tracking branch 'origin/dev' into dev 2020-05-13 18:02:47 +08:00
Captain.B 39fa11dc09 删除原来的国际化方式 2020-05-13 18:02:29 +08:00
shiziyuan9527 96e275c095 用户角色国际化 2020-05-13 17:58:26 +08:00
Captain.B 6c2df5f122 float right 2020-05-13 16:29:19 +08:00
Captain.B bef5533656 菜单 2020-05-13 16:26:51 +08:00
shiziyuan9527 3bb0c0eb1a 语言切换入口 2020-05-13 16:07:18 +08:00
q4speed 05a2cf846e Merge remote-tracking branch 'origin/dev' into dev 2020-05-13 14:46:28 +08:00
q4speed 0cfc8c331b 先去掉描述 2020-05-13 14:46:12 +08:00
Captain.B 9d53c76e42 页面 2020-05-13 14:19:31 +08:00
q4speed cdf2d75e6f Merge remote-tracking branch 'origin/dev' into dev 2020-05-13 13:00:00 +08:00
q4speed 709c207fcc 场景公用变量和Header 2020-05-13 12:59:41 +08:00
chenjianxing c88030d1d2 节点操作点击事件禁止冒泡 2020-05-13 11:59:56 +08:00
chenjianxing 4c9f59d7d8 测试计划节点无法拖动 2020-05-13 11:56:51 +08:00
Captain.B 62bf729e8c 代码调整 2020-05-13 10:33:16 +08:00
chenjianxing 93ae49263a 抽取表格过滤排序代码 2020-05-12 20:11:14 +08:00
chenjianxing dd7409681b Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-12 19:19:57 +08:00
chenjianxing 833560a70e fix 节点数报错 2020-05-12 19:19:11 +08:00
chenjianxing 63ade5a017 代码结构 2020-05-12 19:14:13 +08:00
Captain.B 1011458ed9 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-05-12 18:55:46 +08:00
Captain.B 2e6dacb028 lombok 2020-05-12 18:55:37 +08:00
王振 8f9ad16870 测试用例步骤编辑自适应文本高度 2020-05-12 18:54:35 +08:00
shiziyuan9527 0a2169b09e bug fix 点击个人信息切换英文 2020-05-12 17:50:18 +08:00
q4speed f334bee3cb 去掉console.log 2020-05-12 16:37:01 +08:00
q4speed 285e79920f Merge remote-tracking branch 'origin/dev' into dev 2020-05-12 16:32:20 +08:00
q4speed dc5fbd083b 修复固定值问题 2020-05-12 16:32:06 +08:00
Captain.B e069dcadd4 统一结果处理 2020-05-12 16:14:02 +08:00
Captain.B b96ee28b67 统一结果处理 2020-05-12 16:06:13 +08:00
Captain.B 19a0fe3b70 代码结构调整,性能测试的相关代码放到一起 2020-05-12 16:03:20 +08:00
Captain.B 94556d6687 Merge remote-tracking branch 'origin/dev' into dev 2020-05-12 15:40:06 +08:00
Captain.B 59a61ca6a8 request lombok 2020-05-12 15:39:23 +08:00
shiziyuan9527 5a703e080e 无法删除当前登录用户 2020-05-12 15:34:48 +08:00
q4speed 80a50999a7 Merge remote-tracking branch 'origin/dev' into dev 2020-05-12 15:27:10 +08:00
q4speed eddc19fa75 增加提取功能的JMX内容 2020-05-12 15:26:55 +08:00
shiziyuan9527 17be7deb21 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/business/components/settings/system/User.vue
2020-05-12 15:23:42 +08:00
shiziyuan9527 a05782e6c1 设置系统管理员入口 2020-05-12 15:19:40 +08:00
Captain.B d9f6e6147e i18n 2020-05-12 14:56:02 +08:00
Captain.B 34ef1be442 i18n 2020-05-12 14:44:56 +08:00
Captain.B ea97ba0023 更新密码单独执行 2020-05-12 11:34:26 +08:00
王振 158f4b2d71 fix typo 2020-05-12 11:32:49 +08:00
q4speed bc294c354c Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/i18n/zh-CN.js
2020-05-12 11:27:36 +08:00
q4speed 796f00f403 增加提取功能的页面 2020-05-12 11:25:04 +08:00