Commit Graph

610 Commits

Author SHA1 Message Date
q4speed a5bc32ff57 修改多个脚本并行运行的处理方式 2020-05-22 16:45:08 +08:00
q4speed 4896115c1c Merge remote-tracking branch 'origin/dev' into dev 2020-05-22 13:25:44 +08:00
q4speed 44cfaf811a 增加创建人列 2020-05-22 13:25:16 +08:00
Captain.B 01924836a4 Merge remote-tracking branch 'origin/dev' into dev 2020-05-22 11:32:53 +08:00
Captain.B b988ea1331 添加user字段 2020-05-22 11:30:17 +08:00
shiziyuan9527 c727bf356c 组织,工作空间同名检查 2020-05-22 11:19:39 +08:00
shiziyuan9527 e4d1046152 组织同名检查 2020-05-22 11:00:35 +08:00
chenjianxing cf83d9efae Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-22 09:25:39 +08:00
chenjianxing 3981cc8741 国际化 2020-05-22 09:24:00 +08:00
shiziyuan9527 3323d6f8c3 修改新建用户时角色选择项 2020-05-21 18:45:47 +08:00
Captain.B 601cc89395 Merge remote-tracking branch 'origin/dev' into dev 2020-05-21 18:13:28 +08:00
q4speed 601e329f0d 测试运行后自动跳转到报告 2020-05-21 18:10:16 +08:00
Captain.B a11eb7dab1 DDL 使用 utf8mb4_general_ci,user 中的 id 和 password 使用 utf8mb4_bin 2020-05-21 17:46:00 +08:00
chenjianxing 18b4250dbf Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-21 14:42:34 +08:00
chenjianxing d031adf090 模版名称校验 2020-05-21 14:41:08 +08:00
wenyann 9887cf5904 修改 2020-05-21 14:04:34 +08:00
Captain.B dd26ca150b part index 2020-05-21 11:39:25 +08:00
chenjianxing 0fee46ceaf excel国际化加锁 2020-05-21 10:10:51 +08:00
chenjianxing 8853b39dd7 保留两位小数 2020-05-21 09:35:40 +08:00
chenjianxing c4d6ec1f26 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-21 09:02:48 +08:00
shiziyuan9527 abf1135a7a 新建/编辑用户时增加角色选择项 2020-05-20 21:55:01 +08:00
Captain.B 64f6e05b93 download log 2020-05-20 20:48:04 +08:00
Captain.B 3b55c2236c download log 2020-05-20 20:28:06 +08:00
Captain.B 7f915f8467 log model 2020-05-20 20:04:08 +08:00
Captain.B bd58dffee0 log model 2020-05-20 20:02:50 +08:00
Captain.B 23ef8714a7 修改保存metric 2020-05-20 19:16:59 +08:00
Captain.B b623a34631 修改保存metric 2020-05-20 18:56:28 +08:00
Captain.B 92d6a7e369 Merge remote-tracking branch 'origin/dev' into dev 2020-05-20 18:56:09 +08:00
Captain.B b5df16df7c 修改保存metric 2020-05-20 18:55:51 +08:00
q4speed 5c75349171 Merge remote-tracking branch 'origin/dev' into dev 2020-05-20 17:55:15 +08:00
q4speed 0b6ea9cd09 修复场景排序bug 2020-05-20 17:55:02 +08:00
wenyann 2f1c847e87 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
2020-05-20 17:27:03 +08:00
wenyann 7f06194cff 邮件服务设置 2020-05-20 17:22:45 +08:00
q4speed dc2a1202ae 修复报告中请求失败数错误的bug 2020-05-20 16:29:23 +08:00
shiziyuan9527 621472d1b2 删除无用代码 2020-05-20 15:23:18 +08:00
chenjianxing 58ace8e0e8 fix 首页报错 2020-05-19 19:53:52 +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
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
shiziyuan9527 b1de405457 i18n 2020-05-19 11:39:34 +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
chenjianxing 3870a81222 校验信息国际化 2020-05-18 16:05:47 +08:00
chenjianxing 306e34494c JSR-303校验国际化 2020-05-18 15:48:16 +08:00
q4speed bb7d818a33 修复测试关联报告查询错误的bug
首页增加测试日历功能
2020-05-18 15:32:20 +08:00
Captain.B ffdf8ef805 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-05-18 14:17:50 +08:00