 miss
|
ac2af05d28
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-15 18:13:14 +08:00 |
 daiao
|
02861c3bd2
|
单选多选题缺陷修复
|
2017-09-15 11:23:24 +08:00 |
|
daiao
|
a6845d79b0
|
Merge branch 'dev_daiao' into develop
|
2017-09-15 10:40:05 +08:00 |
|
daiao
|
0204232e49
|
导出excel
|
2017-09-15 10:39:07 +08:00 |
|
daiao
|
05553faf7d
|
实训tip按钮修改
|
2017-09-15 10:00:05 +08:00 |
|
daiao
|
67fa2021c5
|
实训tab页一律不要弹出新的浏览器页面
|
2017-09-15 09:33:18 +08:00 |
|
daiao
|
44e99157b5
|
实训TPI报500
|
2017-09-15 09:24:08 +08:00 |
|
daiao
|
d2e03de9eb
|
匿评作业报500
|
2017-09-15 09:13:28 +08:00 |
|
daiao
|
ec22bbe0c1
|
Merge branch 'develop' into dev_daiao
Conflicts:
app/controllers/games_controller.rb
app/views/challenges/edit.html.erb
app/views/games/_game_show.html.erb
public/stylesheets/css/edu-common.css
|
2017-09-15 09:10:36 +08:00 |
|
miss
|
25cb688ace
|
测试集前端显示空格及提示语
|
2017-09-15 09:08:01 +08:00 |
|
daiao
|
a67f4ca0f7
|
实训单选多选题TPM优化
|
2017-09-14 19:41:30 +08:00 |
|
daiao
|
ab3cfc69bd
|
TPI单选多选题，全部列表刷新
|
2017-09-14 18:59:41 +08:00 |
|
daiao
|
9dc48292eb
|
单选多选题
|
2017-09-14 18:45:19 +08:00 |
|
daiao
|
2c7e5d1f38
|
TPI单选多选题
|
2017-09-14 17:30:58 +08:00 |
|
miss
|
7ddaa7a9ee
|
tab公共样式的替换
|
2017-09-14 09:55:28 +08:00 |
|
miss
|
34d464bf41
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
# Conflicts:
# app/views/users/show.html.erb
# config/routes.rb
# public/stylesheets/css/edu-common.css
|
2017-09-14 09:14:55 +08:00 |
|
miss
|
14209be057
|
添加学生弹框样式问题，实训tpm版本库页面。模块之间需要有距离，ta的主页样式问题，我的资料页去除灰色背景并调整间距，成长中心的表格样式修正
我的主页和各个功能首页的左侧功能条，部分点击事项更改为直接刷新显示
个人主页的问题反馈，点击进入超级管理员的留言页面（）
我的题库和公共题库页尾显示的内容，请保持区域内上下居中
实训和课堂搜索后，无数据时的内容区域与文字要有间距
实训的配置页面不需要重复显示版本库
个人主页、我的课堂和我的实训的新建、加入按钮样式与各首页保持一致
我的留言、给TA留言和私信的页面需要去掉背景灰色和加边框阴影
在线课堂首页的搜索tip需要更换新样式，课堂名称显示全的话不显示tip，带有省略号的话需要有tip
|
2017-09-14 09:09:12 +08:00 |
 caishi
|
7bb99cee44
|
选择题选项显示和选择
|
2017-09-13 17:10:39 +08:00 |
|
daiao
|
44d1e1dfcc
|
实训版本库的提交历史页和详情页，内容与导航重叠了
|
2017-09-13 16:42:47 +08:00 |
|
daiao
|
91f141d9b8
|
个人主页“我的实训”新建不打开新窗口，请直接刷新显示
|
2017-09-13 16:30:36 +08:00 |
|
daiao
|
a502093623
|
修改TPM版本库的tip文字
|
2017-09-13 16:24:26 +08:00 |
|
daiao
|
f79a40ca65
|
单选多选题
|
2017-09-13 16:01:18 +08:00 |
 cxt
|
0a774e793f
|
测试
|
2017-09-12 17:37:53 +08:00 |
|
cxt
|
e87bc406a6
|
添加日志
|
2017-09-12 17:32:50 +08:00 |
|
cxt
|
4a678d84f8
|
实训路径新建阶段时去掉选择实训的判断
|
2017-09-12 17:05:55 +08:00 |
|
cxt
|
847a78620f
|
实训发送至报500
|
2017-09-12 17:05:21 +08:00 |
|
cxt
|
d458bca09c
|
超级管理员的课堂列表的搜索修改
|
2017-09-12 16:31:56 +08:00 |
|
cxt
|
7df093acd7
|
Merge branch 'dev_cxt' into develop
|
2017-09-12 16:27:44 +08:00 |
|
cxt
|
9ab1b6d61f
|
第一次设置时有匿评保存，再修改普通作业的设置时去掉匿评后进行保存，点击无效
|
2017-09-12 16:26:13 +08:00 |
|
daiao
|
32eaaef9fc
|
新版实训TPM单选多选题
|
2017-09-12 16:22:52 +08:00 |
|
daiao
|
0a1e895dc2
|
单选多选题的TPM（初版）
|
2017-09-12 14:08:19 +08:00 |
|
daiao
|
a27f10d884
|
选择题的新建和详情页面
|
2017-09-12 09:05:51 +08:00 |
|
cxt
|
14e8474bad
|
实训作业的查看弹框，耗时显示有问题
|
2017-09-11 15:59:36 +08:00 |
|
cxt
|
4adb8cbab6
|
实训作业的评分调整
|
2017-09-11 15:48:02 +08:00 |
|
cxt
|
4c7eb01bbf
|
实训tpm的发送至的弹框中的数据少了新建课堂的
|
2017-09-11 15:14:19 +08:00 |
|
cxt
|
8ed3696f6f
|
作业结束后作品列表为空
|
2017-09-11 14:42:27 +08:00 |
|
cxt
|
d36a95d90c
|
实训的多个课程关联
|
2017-09-11 10:36:12 +08:00 |
|
cxt
|
c6c6709bc6
|
Merge branch 'develop' into dev_cxt
|
2017-09-11 09:44:29 +08:00 |
 huang
|
45c2d744b1
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-10 12:14:26 +08:00 |
|
huang
|
a7db6441b8
|
样式问题
|
2017-09-10 12:14:14 +08:00 |
|
daiao
|
026355e278
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-10 11:59:44 +08:00 |
|
daiao
|
2111ad8f0d
|
解决火狐浏览器要点击2次才能聚焦
|
2017-09-10 11:59:26 +08:00 |
|
huang
|
b1dcebae0c
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-10 11:41:59 +08:00 |
|
huang
|
f6a8a0f959
|
授权排序问题
|
2017-09-10 11:41:44 +08:00 |
|
daiao
|
4ecf8fc983
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-10 11:41:21 +08:00 |
|
daiao
|
6af2de7240
|
管理员样式
|
2017-09-10 11:41:06 +08:00 |
 XuCheng642
|
2a2257e3ed
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-10 11:31:31 +08:00 |
|
XuCheng642
|
3a97d3e112
|
样式修改
|
2017-09-10 11:29:34 +08:00 |
|
huang
|
a821e0a4b4
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-10 11:26:36 +08:00 |
|
huang
|
b208907aeb
|
用户页面排序问题
|
2017-09-10 11:26:19 +08:00 |