Commit Graph

8733 Commits

Author SHA1 Message Date
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 09a5c11ab0 查询project 2020-02-20 17:12: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 ad2dfef8a3 保留一份配置 2020-02-20 13:32:41 +08:00
Captain.B 61715c2d52 Merge branch 'dev' of bin.github.com:fit2cloudrd/metersphere-server into dev 2020-02-20 12:56:22 +08:00
Captain.B 6dac23d291 文件格式修改 2020-02-20 12:55:26 +08:00
haifeng414 7c968eda35 fix直接点击保存并运行按钮无法运行 2020-02-20 12:43:34 +08:00
haifeng414 8239567c9e 暂时取消压缩功能 2020-02-20 12:29:19 +08:00
haifeng414 5f6368d1b5 Merge remote-tracking branch 'origin/dev' into dev 2020-02-20 12:10:47 +08:00
haifeng414 3ce09effdb 脚本内容压缩 2020-02-20 12:10:32 +08:00
Captain.B 7816dc56b9 切换工工作空间修改 2020-02-20 11:14:54 +08:00
Captain.B 8c546b7afa project search 2020-02-20 09:45:28 +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
haifeng414 b9f58a8910 完成解析jmx文件逻辑 2020-02-19 20:25:18 +08:00
haifeng414 5457a369da Merge remote-tracking branch 'origin/dev' into dev 2020-02-19 18:07:58 +08:00
haifeng414 98d54b3183 修改包名 2020-02-19 18:04:44 +08:00
Captain.B 0728ad91af project workspace name check 2020-02-19 16:51:11 +08:00
Captain.B e5f57dc68b 去掉todo 2020-02-19 16:28:15 +08:00
Captain.B a6cca8e701 project set workspace_id 2020-02-19 15:42:03 +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 40c8b42834 SessionUser 2020-02-19 14:33:23 +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
Captain.B f11b545fe7 Merge remote-tracking branch 'origin/dev' into dev 2020-02-19 11:43:40 +08:00
Captain.B 182d5b2450 set roles 2020-02-19 11:43:16 +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
haifeng414 19478566a1 删除无用的日志 2020-02-18 21:31:28 +08:00
haifeng414 e6b2a577cb Merge remote-tracking branch 'origin/dev' into dev 2020-02-18 21:26:21 +08:00
haifeng414 951fe9f5d2 通过保存并运行按钮本地运行上传文件 2020-02-18 21:25:51 +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