Commit Graph

1574 Commits

Author SHA1 Message Date
Captain.B 683d6272f7 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-06-08 11:59:10 +08:00
Captain.B 66b60dbbc6 删除无用的代码 2020-06-08 11:56:31 +08:00
chenjianxing 1b35fa2b5f Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-08 11:55:50 +08:00
chenjianxing 5c2fb3fca1 删除测试计划确认 2020-06-08 11:55:10 +08:00
shiziyuan9527 c45659a9de 项目名长度限制 2020-06-08 11:33:00 +08:00
王振 a127177c85 Merge branch 'master' into dev 2020-06-08 10:29:39 +08:00
王振 9e78c42960 add LICENSE 2020-06-06 10:51:02 +08:00
BugKing f1186ca20e
Merge pull request #1 from maninhill/patch-1
Update README.md
2020-06-06 00:56:11 +08:00
maninhill 7443221a18
Update README.md 2020-06-06 00:48:00 +08:00
王振 371e792025 修改展示图片 2020-06-05 20:04:49 +08:00
王振 8eb62a9250 调整图片大小 2020-06-05 20:02:48 +08:00
王振 6a60e6d723 update readme 2020-06-05 20:00:59 +08:00
王振 46719ec450 update readme 2020-06-05 20:00:15 +08:00
王振 093fec498d update readme 2020-06-05 19:58:09 +08:00
王振 34fb71b19e update readme 2020-06-05 19:17:41 +08:00
王振 5032ad2d3e update readme 2020-06-05 19:15:41 +08:00
王振 1e3c99faef update readme 2020-06-05 19:12:16 +08:00
shiziyuan9527 050a48fa73 fix ajax.js 2020-06-05 18:15:05 +08:00
shiziyuan9527 5eca6de52f fix 2020-06-05 17:52:51 +08:00
chenjianxing d07676e678 i18n 2020-06-05 17:37:27 +08:00
q4speed c02c4b865c 简化 2020-06-05 17:18:17 +08:00
wenyann b4634994bf 'checked' 2020-06-05 17:15:50 +08:00
wenyann d42f399a49 Merge remote-tracking branch 'origin/dev' into dev 2020-06-05 16:03:18 +08:00
wenyann 8fa8a86912 '修复smtp设置取消保存成功' 2020-06-05 16:02:56 +08:00
chenjianxing ed556adc59 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-05 15:31:13 +08:00
wenyann 1477e6961a Merge remote-tracking branch 'origin/dev' into dev 2020-06-05 15:30:11 +08:00
wenyann 2caa6637d7 '资源池url和token默认填充' 2020-06-05 15:28:57 +08:00
shiziyuan9527 80a870c548 bug fix 2020-06-05 15:25:54 +08:00
chenjianxing 5df638d51c 统一首页跳转样式 2020-06-05 14:49:47 +08:00
shiziyuan9527 9acb7e38a2 fix 无角色登录 2020-06-05 14:44:11 +08:00
chenjianxing 511cd64a4e Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-05 14:41:39 +08:00
chenjianxing d74f2e5b01 接口性能测试跳转只读用户 2020-06-05 14:40:58 +08:00
chenjianxing 9d2da8f7f9 最近测试只读用户 2020-06-05 14:27:19 +08:00
chenjianxing 2ee269c533 最近测试只读用户 2020-06-05 14:19:05 +08:00
chenjianxing b4e5dbc382 性能测试点击一行只读 2020-06-05 11:20:40 +08:00
chenjianxing 8af9a73d9a api测试点击一行只读 2020-06-05 10:59:53 +08:00
shiziyuan9527 5291f6073c i18n 2020-06-05 10:46:14 +08:00
chenjianxing cb3b90a033 网站链接 2020-06-05 09:52:17 +08:00
chenjianxing ba7f600b8c 关于页宽度 2020-06-05 09:50:29 +08:00
shiziyuan9527 0923ed43de Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-06-04 18:52:10 +08:00
shiziyuan9527 1304459791 i18n 2020-06-04 18:51:48 +08:00
wenyann ba94365ea8 '合并' 2020-06-04 18:43:54 +08:00
wenyann 285037e475 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	backend/src/main/java/io/metersphere/controller/SystemParameterController.java
#	backend/src/main/java/io/metersphere/service/SystemParameterService.java
2020-06-04 18:34:32 +08:00
wenyann fc8cad2679 '添加查询默认smtp设置' 2020-06-04 18:32:06 +08:00
q4speed 3e126e7f3e 新页面打开链接 2020-06-04 18:10:38 +08:00
shiziyuan9527 1b12e870d0 系统设置下信息列表按照时间排序查询 2020-06-04 17:57:36 +08:00
q4speed 79c7ac49a6 Merge remote-tracking branch 'origin/dev' into dev 2020-06-04 16:41:14 +08:00
q4speed 7d95c69637 修改标题等内容 2020-06-04 16:40:43 +08:00
chenjianxing d4d09ccf0d 关于 2020-06-04 16:09:03 +08:00
chenjianxing 5833c3b902 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-04 15:56:47 +08:00