 caishi
|
c7ac2bdb41
|
Merge branch 'dev_cxt' into dev_cs
Conflicts:
app/views/messages/_course_show.html.erb
app/views/student_work/index.html.erb
|
2017-09-30 18:27:00 +08:00 |
 cxt
|
1b5b77b6c5
|
测验的编辑
|
2017-09-30 16:10:07 +08:00 |
|
caishi
|
f6aad05821
|
系统提示性弹框的文字请统一改为黑色333
实训TPM待审核状态的tip修改
|
2017-09-29 15:56:17 +08:00 |
|
cxt
|
e13bb9316f
|
试卷的插入、上下移动、删除等功能
|
2017-09-29 15:55:37 +08:00 |
|
cxt
|
37f5b9ff46
|
试卷作品列表
|
2017-09-29 10:20:09 +08:00 |
|
cxt
|
7aef72d7a3
|
在线试卷
|
2017-09-28 16:51:15 +08:00 |
 miss
|
ae4c134953
|
tip问题的解决
|
2017-09-27 17:41:01 +08:00 |
|
caishi
|
137eb2739d
|
Issues
|
2017-09-26 15:38:44 +08:00 |
|
caishi
|
39c4213bbe
|
实训tpi中预期输出的答案没有从冒号后开始
|
2017-09-26 11:10:09 +08:00 |
|
cxt
|
3f3f3804ba
|
Merge branch 'dev_cs' into develop
|
2017-09-22 21:10:31 +08:00 |
|
cxt
|
4d408ded24
|
添加教师的调整
|
2017-09-22 21:09:35 +08:00 |
|
cxt
|
5fc722a5cd
|
添加学生的弹框调整
|
2017-09-22 20:37:44 +08:00 |
 XuCheng642
|
23550b8923
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/controllers/managements_controller.rb
|
2017-09-22 18:48:03 +08:00 |
|
miss
|
e3b64c1e26
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
# Conflicts:
# public/stylesheets/css/ketang.css
# public/stylesheets/css/taskstyle.css
|
2017-09-22 17:17:51 +08:00 |
|
caishi
|
78874ff0cc
|
Merge branch 'dev_cs' into develop
Conflicts:
app/controllers/student_work_controller.rb
app/helpers/student_work_helper.rb
app/views/courses/sync_students.js.erb
|
2017-09-22 17:12:37 +08:00 |
|
cxt
|
42351bc93d
|
Merge branch 'dev_cxt' into dev_cs
Conflicts:
app/views/layouts/_group_children_list.html.erb
app/views/subjects/new.html.erb
|
2017-09-22 14:56:43 +08:00 |
|
miss
|
9076facbca
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
# Conflicts:
# app/views/shixuns/settings.html.erb
|
2017-09-22 14:50:53 +08:00 |
|
miss
|
76a3026f97
|
step3学员统计板块，二次回复的提示，作品页样式的调整，实训tpm配置页面上边线没有阴影。我的关注以及我的粉丝页面样式及tip问题，编辑作业给出的错误提示框无法关闭的问题，新建作业时显示的下拉列表的文字错乱问题，我的题库详情页面的菜单按钮的位置调整，班级所有页面的阴影背景色的修改。个人主页，实训，课程的tab的统一，班级成员管理的tip出现条件以及出现位置的修改
|
2017-09-22 14:47:53 +08:00 |
 huang
|
a234bdc01b
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 10:47:41 +08:00 |
|
huang
|
821abc8434
|
实训复制添加提醒及过渡动画
|
2017-09-22 10:38:56 +08:00 |
|
caishi
|
b4b296d130
|
Merge branch 'develop' into dev_cs
Conflicts:
app/views/challenges/_single_or_multiple_question_show.html.erb
|
2017-09-22 08:51:34 +08:00 |
|
XuCheng642
|
552953b408
|
Merge branch 'develop' into dev_xucheng
|
2017-09-21 21:00:54 +08:00 |
|
XuCheng642
|
ad993b64d1
|
管理员界面消息列表
|
2017-09-21 20:59:39 +08:00 |
|
caishi
|
219ff96ea0
|
增加在线课堂的教师或者助教待审批提醒，且更换样式
|
2017-09-21 18:29:07 +08:00 |
 daiao
|
9ce12c0ada
|
上线缺陷修复
|
2017-09-21 18:13:08 +08:00 |
|
cxt
|
86e2f60946
|
Merge branch 'develop' into dev_cxt
Conflicts:
app/controllers/shixuns_controller.rb
app/views/subjects/new.html.erb
public/javascripts/edu/base_edu.js
|
2017-09-21 17:46:58 +08:00 |
|
daiao
|
500aa17ab0
|
火狐浏览器TPI加载中转转圈样式调整
|
2017-09-21 14:45:38 +08:00 |
|
cxt
|
cefc5edbfe
|
实训路径的简介、学习须知，请改为 ke 编辑器，需要插入图片
|
2017-09-21 11:07:44 +08:00 |
|
daiao
|
4d6b0f5cda
|
全部任务中金币数值和评测中的金币数值需保持一致
|
2017-09-21 10:37:35 +08:00 |
|
daiao
|
833be4dbaa
|
训路径的简介、学习须知，请改为 ke 编辑器
|
2017-09-20 11:16:26 +08:00 |
|
caishi
|
a09450a805
|
Merge branch 'dev_cs' into develop
Conflicts:
app/views/games/_choice_question.html.erb
|
2017-09-19 17:17:40 +08:00 |
|
caishi
|
df60c289ad
|
选择题选项换行、开始实战的加载层
|
2017-09-19 17:15:50 +08:00 |
|
cxt
|
f91deb919a
|
评阅作品时，不要给出一个-1的默认值
|
2017-09-18 16:23:06 +08:00 |
|
cxt
|
71709212cb
|
新建分班后跳到全部学生列表
|
2017-09-18 15:27:58 +08:00 |
|
cxt
|
c8a484f109
|
删除分班后，左侧菜单栏没有刷新
|
2017-09-18 14:25:42 +08:00 |
|
cxt
|
0023e8b32f
|
在线课堂-作业挂起时请显示设置的发布时间
|
2017-09-18 10:42:30 +08:00 |
|
daiao
|
63aed6be25
|
C语言评测实际输出与中间层统一
|
2017-09-18 10:12:50 +08:00 |
|
daiao
|
09b3e5dc46
|
测试集特殊字符匹配
|
2017-09-18 08:44:08 +08:00 |
|
miss
|
d1c6129271
|
主页、以及题库tab位置调整，tip位置的调整
|
2017-09-18 08:41:06 +08:00 |
|
daiao
|
7454ce85b7
|
实训测试集
|
2017-09-17 16:43:36 +08:00 |
|
daiao
|
752210f0fc
|
实际输出
|
2017-09-17 16:31:17 +08:00 |
|
daiao
|
055a254811
|
测试集样式修改
|
2017-09-17 11:24:57 +08:00 |
|
daiao
|
39064be34b
|
刷新测试集提示样式修改
|
2017-09-17 11:08:03 +08:00 |
|
cxt
|
61f1d9bd10
|
课堂相关修改
|
2017-09-15 22:35:36 +08:00 |
|
cxt
|
3d0f1839a7
|
Merge branch 'dev_cs' into develop
Conflicts:
app/views/challenges/_single_or_multiple_question.html.erb
app/views/messages/_common_reply_box.html.erb
app/views/praise_tread/_edu_praise.html.erb
app/views/student_work/_common_reply_box.html.erb
|
2017-09-15 21:05:56 +08:00 |
|
cxt
|
d2d388972a
|
班级页面的分班
|
2017-09-15 20:59:35 +08:00 |
|
miss
|
c51832e2bd
|
tip样式的调整
|
2017-09-15 20:23:49 +08:00 |
|
XuCheng642
|
ac28f83271
|
Merge branch 'develop' into dev_xucheng
Conflicts:
app/controllers/managements_controller.rb
app/helpers/application_helper.rb
app/views/subjects/_subject_list.html.erb
config/routes.rb
|
2017-09-15 18:35:37 +08:00 |
|
XuCheng642
|
1240c50cb5
|
班级帖子发送样式
|
2017-09-15 18:17:19 +08:00 |
|
miss
|
ac2af05d28
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-15 18:13:14 +08:00 |