test/MeterSphere
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git synced 2024-12-02 12:09:13 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity
15,857 Commits 46 Branches 171 Tags 416 MiB
1ec447be2b
Commit Graph

8744 Commits

Author SHA1 Message Date
Captain.B
320e941df5 create project 2020-02-27 10:55:39 +08:00
q4speed
25044d1e35 格式化翻译示例 2020-02-27 10:54:50 +08:00
Captain.B
6209a5f9b1 create project 2020-02-27 10:00:25 +08:00
Captain.B
14e5c8f08c create project 2020-02-26 18:58:22 +08:00
Captain.B
be37974388 Merge remote-tracking branch 'origin/dev' into dev 2020-02-26 18:48:18 +08:00
Captain.B
2576b9c035 ms project 2020-02-26 18:47:51 +08:00
shiziyuan9527
e1d8323604 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	frontend/src/i18n/en_US.js
#	frontend/src/i18n/zh_CN.js
 2020-02-26 18:43:13 +08:00
shiziyuan9527
a7ea334005 组织菜单国际化 2020-02-26 18:38:57 +08:00
Captain.B
9c7b776a37 ms project 2020-02-26 18:31:07 +08:00
Captain.B
758165157a Merge remote-tracking branch 'origin/dev' into dev 2020-02-26 17:34:43 +08:00
shiziyuan9527
f8a357a3d0 修改组件名称 2020-02-26 17:34:08 +08:00
Captain.B
3fac641990 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-02-26 17:34:05 +08:00
Captain.B
1ab4b75e79 项目的点击事件 2020-02-26 17:33:59 +08:00
shiziyuan9527
31389167bc 新建工作空间时选择组织 2020-02-26 17:22:32 +08:00
Captain.B
a77ba70aa7 ms- 2020-02-26 16:40:13 +08:00
Captain.B
07010dea55 Merge remote-tracking branch 'origin/dev' into dev 2020-02-26 16:37:04 +08:00
Captain.B
0f4fab3092 bug fix 2020-02-26 16:36:51 +08:00
shiziyuan9527
0132219336 系统管理员工作空间管理增加组织列 2020-02-26 16:18:12 +08:00
q4speed
947a5db82e add zh_TW 2020-02-26 16:02:46 +08:00
Captain.B
2b5ce5a44e Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-02-26 15:20:02 +08:00
Captain.B
c4b9b9987c 默认跳转 2020-02-26 15:19:52 +08:00
shiziyuan9527
e554c951f4 组织菜单工作空间查询限制 2020-02-26 15:13:51 +08:00
Captain.B
b226f43b8d Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-02-26 14:58:17 +08:00
Captain.B
2d0d1c5279 最近的测试 2020-02-26 14:58:04 +08:00
q4speed
ff0e26f1c1 fix warn 2020-02-26 14:54:10 +08:00
shiziyuan9527
bbd28d0ef9 新增系统设置中工作空间选项 2020-02-26 13:48:41 +08:00
Captain.B
ca9d2cfd22 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-02-26 13:31:03 +08:00
Captain.B
32df172547 最近的项目 2020-02-26 13:30:50 +08:00
shiziyuan9527
f228d1792d 个人信息设置页面 2020-02-26 13:28:08 +08:00
Captain.B
3923aca94f 工作空间国际化 0.2 2020-02-26 11:24:52 +08:00
Captain.B
194f8fa372 工作空间国际化 0.1 2020-02-26 10:35:46 +08:00
shiziyuan9527
5371e09c23 菜单按照组织工作空间隔离 2020-02-25 18:34:46 +08:00
shiziyuan9527
8ff3d8f072 组织和工作空间切换0.5 2020-02-25 15:50:38 +08:00
shiziyuan9527
9e9951adcb 组织和工作空间切换0.1 2020-02-25 14:53:22 +08:00
q4speed
62c778741d 异步加载语言文件 2020-02-25 11:36:15 +08:00
Captain.B
2afa1bca4c roles indexOf bug fix 2020-02-24 18:55:44 +08:00
shiziyuan9527
eeadaa2c78 菜单整理 2020-02-24 18:13:39 +08:00
shiziyuan9527
8c121c39de 组织成员管理 2020-02-24 17:41:09 +08:00
shiziyuan9527
814c573010 组织成员管理 2020-02-24 14:06:07 +08:00
haifeng414
d8408e9c7e Merge remote-tracking branch 'origin/dev' into dev 2020-02-21 11:46:23 +08:00
haifeng414
b26d5c9667 压力配置参数对其 2020-02-21 11:45:57 +08:00
Captain.B
6015af2029 header v-permission 2020-02-21 09:43:28 +08:00
Captain.B
c715ebd481 current user 2020-02-20 22:27:48 +08:00
shiziyuan9527
4bdd6630a1 进入子路由也保持顶部菜单激活 2020-02-20 21:07:01 +08:00
haifeng414
09d33859c8 Merge remote-tracking branch 'origin/dev' into dev 2020-02-20 21:03:18 +08:00
haifeng414
f95b8420c8 添加rps参数 2020-02-20 21:03:02 +08:00
Captain.B
e65c5aabeb Merge remote-tracking branch 'origin/dev' into dev 2020-02-20 20:22:32 +08:00
Captain.B
35c228692d user email regex 2020-02-20 20:22:17 +08:00
haifeng414
36544f3621 Merge remote-tracking branch 'origin/dev' into dev 2020-02-20 20:01:15 +08:00
haifeng414
405eb63997 fix 编辑的时候修改文件后无法运行 2020-02-20 20:00:46 +08:00
Captain.B
d695bb15f4 recent project 0.1 2020-02-20 19:55:36 +08:00
Captain.B
0fb744a8a2 Merge branch 'dev' of bin.github.com:fit2cloudrd/metersphere-server into dev 2020-02-20 17:48:45 +08:00
Captain.B
2c84557bc1 file download 2020-02-20 17:47:58 +08:00
shiziyuan9527
5642c7b70c Merge remote-tracking branch 'origin/dev' into dev 2020-02-20 17:42:45 +08:00
shiziyuan9527
c2af2179b0 添加Header菜单修改样式 2020-02-20 17:42:22 +08:00
Captain.B
2ededed640 url 2020-02-20 15:19:11 +08:00
shiziyuan9527
681db17d4c 修改切换组织和切换工作空间的位置 2020-02-20 15:07:29 +08:00
Captain.B
7816dc56b9 切换工工作空间修改 2020-02-20 11:14:54 +08:00
shiziyuan9527
fe2e2e3e73 切换组织和切换工作空间0.1 2020-02-19 22:40:57 +08:00
haifeng414
2c70faf180 完成前端运行逻辑10% 2020-02-19 21:39:43 +08:00
Captain.B
ba4c27281e project page limit 2020-02-19 15:37:52 +08:00
Captain.B
3171ba063c username auto focus 2020-02-19 15:26:21 +08:00
shiziyuan9527
37001b2572 修改loading 2020-02-19 15:15:53 +08:00
Captain.B
d3957e929e header v-permission 2020-02-19 15:02:46 +08:00
Captain.B
63759b9f4f project loading 2020-02-19 14:11:49 +08:00
shiziyuan9527
618846c73a 根据用户角色集合展示对应的内容 2020-02-19 13:19:12 +08:00
haifeng414
9c6d4fa7cd 添加loading 2020-02-19 12:54:28 +08:00
q4speed
22d729c169 修改loading方法 2020-02-19 12:12:35 +08:00
haifeng414
a2c9277c61 Merge remote-tracking branch 'origin/dev' into dev 2020-02-19 11:47:51 +08:00
haifeng414
52b9d0d21e 未找到关联文件时报错 2020-02-19 11:47:35 +08:00
shiziyuan9527
fd0389c86f 修改调用方式 2020-02-19 11:31:01 +08:00
Captain.B
14a6b787e0 Merge remote-tracking branch 'origin/dev' into dev 2020-02-19 11:05:08 +08:00
Captain.B
7acd70fd8b v-loading 2020-02-19 11:01:24 +08:00
haifeng414
fe87891dab Merge remote-tracking branch 'origin/dev' into dev 2020-02-19 10:55:43 +08:00
haifeng414
1bd6b77182 修改ajax回调的使用方式 2020-02-19 10:55:18 +08:00
shiziyuan9527
9a316738e3 用户列表分页和组织列表分页 2020-02-18 22:43:13 +08:00
shiziyuan9527
1265cacfd6 修改创建图标位置 2020-02-18 20:08:52 +08:00
W23123
d085c2a27d 成员管理 0.999 2020-02-18 17:41:51 +08:00
W23123
825d213221 成员管理 0.99 2020-02-18 17:31:45 +08:00
W23123
7773eda15a Merge remote-tracking branch 'origin/dev' into dev 2020-02-18 17:20:44 +08:00
W23123
71cf45d8af 成员管理 0.9 2020-02-18 17:20:21 +08:00
Captain.B
40f0159f89 workspace check owner 2020-02-18 16:27:25 +08:00
Captain.B
e3825f388a project page 2020-02-18 14:16:23 +08:00
Captain.B
be1daa5e87 project page limit 2020-02-18 14:06:47 +08:00
Captain.B
d5470c33c9 Merge branch 'dev' of bin.github.com:fit2cloudrd/metersphere-server into dev 2020-02-18 13:49:47 +08:00
Captain.B
16a152e5ea workspace page limit 2020-02-18 13:49:06 +08:00
haifeng414
677bdb959a Merge remote-tracking branch 'origin/dev' into dev 2020-02-18 13:41:31 +08:00
haifeng414
828faeba0a 修改过滤器位置 2020-02-18 13:40:32 +08:00
W23123
d347a6dbe8 修改创建图标 2020-02-18 12:50:05 +08:00
W23123
b1343ef0d9 成员分页列表 2020-02-18 12:19:46 +08:00
W23123
f668fd6891 成员管理后端接口 加上角色验证 2020-02-18 11:34:33 +08:00
shiziyuan9527
dac30f47a5 角色切换 2020-02-17 23:58:09 +08:00
haifeng414
a30af57c28 完成创建和编辑测试时文件保存相关逻辑 2020-02-17 21:59:34 +08:00
haifeng414
a5de8cebbb 测试列表按照名称搜索 2020-02-17 16:55:33 +08:00
haifeng414
25a8ca4604 Merge remote-tracking branch 'origin/dev' into dev 2020-02-17 16:25:29 +08:00
haifeng414
54ad67d899 上传的文件保存到数据库 2020-02-17 15:00:13 +08:00
Captain.B
02c52f0fca project add list 0.1 2020-02-17 13:04:02 +08:00
haifeng414
1862341e94 删除临时添加的依赖 2020-02-15 14:05:15 +08:00
haifeng414
de2ad1337b 保存测试到数据库 2020-02-15 14:04:05 +08:00
haifeng414
25cefe71df Merge remote-tracking branch 'origin/dev' into dev 2020-02-15 10:44:28 +08:00
haifeng414
3b8f2ff32b 修改所有测试页面样式 2020-02-15 10:44:10 +08:00
shiziyuan9527
361ea39dd1 添加v-permission指令 2020-02-14 21:18:47 +08:00
haifeng414
70becf8c29 Merge remote-tracking branch 'origin/dev' into dev 2020-02-14 12:37:03 +08:00
haifeng414
6f70ceea9a 编辑测试时回显一部分数据 2020-02-14 12:34:14 +08:00
Captain.B
7f702e64a5 content -> setting 2020-02-14 12:23:19 +08:00
haifeng414
c9f185366c 解决路由跳转传参问题 2020-02-13 22:49:39 +08:00
haifeng414
416553217a 测试列表的分页实现 2020-02-13 18:24:38 +08:00
Captain.B
cf28e1013d Merge remote-tracking branch 'origin/dev' into dev 2020-02-13 15:41:14 +08:00
Captain.B
ebf322cde3 登录设置权限 0.1 2020-02-13 15:40:51 +08:00
haifeng414
05f62c24af Merge remote-tracking branch 'origin/dev' into dev 2020-02-13 15:38:37 +08:00
haifeng414
40f2763fa6 测试菜单栏简单实现 2020-02-13 15:38:03 +08:00
shiziyuan9527
9d997d8744 Add TestResourcePool.vue 2020-02-13 15:22:48 +08:00
Captain.B
163912046b 从cookie中取出用户 2020-02-13 14:31:57 +08:00
W23123
fec574d869 Merge remote-tracking branch 'origin/dev' into dev 2020-02-13 12:22:21 +08:00
haifeng414
10a9991252 Merge remote-tracking branch 'origin/dev' into dev 2020-02-13 12:22:12 +08:00
W23123
da97b957fd 成员管理路由 2020-02-13 12:22:06 +08:00
haifeng414
62c7ab8617 完成简单的保存逻辑 2020-02-13 12:21:56 +08:00
Captain.B
53979cc3b7 login demo 2020-02-13 11:51:42 +08:00
Captain.B
fe9d6a44c6 workspace del confirm 2020-02-13 11:21:12 +08:00
Captain.B
5a7c21304a Merge branch 'master' into dev 2020-02-12 22:25:05 +08:00
haifeng414
c636d111a7 添加若干交互组件 2020-02-12 22:23:15 +08:00
haifeng414
a732a7291b 文件下载和删除的前端逻辑 2020-02-12 20:55:02 +08:00
shiziyuan9527
a3de4322ff User enable/disable 2020-02-12 19:16:00 +08:00
shiziyuan9527
baeea268f7 Merge remote-tracking branch 'origin/dev' into dev 2020-02-12 17:11:15 +08:00
shiziyuan9527
5783bf4812 Add Organization.vue 2020-02-12 17:04:44 +08:00
Captain.B
b443995e15 cookie 2020-02-12 16:59:07 +08:00
Captain.B
689907cc80 vuex 2020-02-12 16:45:41 +08:00
haifeng414
1c1d419852 文件信息显示 2020-02-12 16:41:19 +08:00
Captain.B
57af617fed router roles demo 2020-02-12 16:27:51 +08:00
Captain.B
7579953c51 Merge branch 'master' into dev 2020-02-12 14:40:31 +08:00
haifeng414
be712b42f7 上传文件并输出到控制台 2020-02-12 14:21:23 +08:00
Captain.B
041093d292 Merge branch 'master' into dev 
# Conflicts:
#	frontend/src/performance/components/router/router.js
 2020-02-12 13:37:56 +08:00
shiziyuan9527
f2b2de0aa2 user update 2020-02-12 12:28:13 +08:00
haifeng414
e084b00d89 添加创建测试的tab 2020-02-12 11:33:08 +08:00
shiziyuan9527
27098f14e2 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-02-11 17:36:36 +08:00
Captain.B
3982976042 workspace delete 2020-02-11 17:34:03 +08:00
shiziyuan9527
8b227c09ac add User.vue and User delete,list 2020-02-11 17:24:30 +08:00
Captain.B
7ca97ac14a workspace list 2020-02-11 15:51:59 +08:00
Captain.B
b09ffedbac workspace add 2020-02-11 15:24:24 +08:00
Captain.B
f51ddf2039 add enter key code 2020-02-11 11:19:31 +08:00
Captain.B
aa25f9513c ignore .settings 2020-02-03 18:47:15 +08:00
Captain.B
8830231352 package name changed. 2020-02-03 16:30:16 +08:00
Captain.B
253a7da6cc 8888 port not working on my mac 2020-02-03 15:16:37 +08:00
Captain.B
c27167a3ba frontend backend 2020-02-03 14:04:27 +08:00