 daiao
|
7c024985bf
|
单选多选题答题模式修改
|
2017-09-25 11:16:16 +08:00 |
 miss
|
5af447875e
|
ajax加载层级调整
|
2017-09-24 10:34:48 +08:00 |
|
miss
|
a0d2420e44
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 20:57:49 +08:00 |
|
miss
|
c6a8b13f97
|
学员统计分页字体颜色
|
2017-09-22 20:57:23 +08:00 |
 caishi
|
ecd081030b
|
成员管理数字跳转
|
2017-09-22 20:42:58 +08:00 |
|
caishi
|
a249e74526
|
字体颜色
|
2017-09-22 19:51:03 +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
|
328ad9546a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-22 17:21:05 +08:00 |
 cxt
|
21b1fc32d9
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/views/student_work/show.html.erb
|
2017-09-22 17:20:25 +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
|
758d1bf39d
|
作品匿评的调整
|
2017-09-22 17:04:40 +08:00 |
|
miss
|
41ec6a4838
|
在线课堂缩小后内容显示换行了，tpm设置板块样式问题
|
2017-09-22 16:40:58 +08:00 |
|
caishi
|
679b5a559d
|
增加多个选择题tab样式问题
|
2017-09-22 16:31:22 +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 |
|
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
|
ad993b64d1
|
管理员界面消息列表
|
2017-09-21 20:59:39 +08:00 |
|
caishi
|
219ff96ea0
|
增加在线课堂的教师或者助教待审批提醒，且更换样式
|
2017-09-21 18:29:07 +08:00 |
|
caishi
|
9bdcfc6b9d
|
body样式
|
2017-09-21 14:21:50 +08:00 |
|
caishi
|
b5c7c5a8d8
|
班级添加学生、教师默认只添加与主讲人所在单位一致的学生
|
2017-09-21 11:19:44 +08:00 |
|
daiao
|
386a7b4d06
|
实训tpi的评论数字样式不对
|
2017-09-21 10:00:05 +08:00 |
|
caishi
|
ee65fd18fb
|
选择题任务通过后，遮罩弹框信息修改
|
2017-09-20 17:16:11 +08:00 |
|
daiao
|
25abf51158
|
实训版本库的样式与其它页面不一致
|
2017-09-20 17:04:35 +08:00 |
|
caishi
|
da6d67eb35
|
动态资源列表、讨论列表调整
|
2017-09-20 14:27:13 +08:00 |
|
caishi
|
df60c289ad
|
选择题选项换行、开始实战的加载层
|
2017-09-19 17:15:50 +08:00 |
|
caishi
|
3eb85ee6f9
|
问吧
|
2017-09-19 09:12:47 +08:00 |
|
daiao
|
055a254811
|
测试集样式修改
|
2017-09-17 11:24:57 +08:00 |
|
daiao
|
491076e8ae
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-17 11:08:41 +08:00 |
|
daiao
|
39064be34b
|
刷新测试集提示样式修改
|
2017-09-17 11:08:03 +08:00 |
|
caishi
|
c465776416
|
帖子详情
|
2017-09-17 11:06:22 +08:00 |
|
caishi
|
174cca8e6d
|
Merge branch 'dev_cs' into develop
|
2017-09-15 22:46:13 +08:00 |
|
caishi
|
a4d0c65cad
|
课堂样式
|
2017-09-15 22:44:36 +08:00 |
 huang
|
bfe758be78
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata 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:13:14 +08:00 |
|
miss
|
ac2af05d28
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-15 18:13:14 +08:00 |
|
caishi
|
e138c204e0
|
分班
|
2017-09-15 17:08:16 +08:00 |
|
caishi
|
26e88c72f0
|
作业列表页面修改
|
2017-09-15 15:23:51 +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 |
|
caishi
|
3a6c508aeb
|
帖子详情
|
2017-09-14 17:07:18 +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
|
e654e8107f
|
分班页面
|
2017-09-13 16:00:47 +08:00 |
|
caishi
|
d67eb13c9b
|
在线课堂页面的更新
|
2017-09-13 10:16:35 +08:00 |
|
caishi
|
7a65852945
|
课程资源、讨论
|
2017-09-11 16:52:58 +08:00 |
|
caishi
|
7f0bdd9c73
|
Merge branch 'develop' into dev_cs
Conflicts:
app/controllers/shixuns_controller.rb
app/views/layouts/base_edu_course.html.erb
app/views/shixuns/_shixun_top.html.erb
app/views/shixuns/search_user_courses.js.erb
public/stylesheets/css/edu-common.css
|
2017-09-11 11:28:26 +08:00 |
|
caishi
|
53bbd41ed1
|
在线课堂
|
2017-09-11 11:07:05 +08:00 |
|
huang
|
a7db6441b8
|
样式问题
|
2017-09-10 12:14:14 +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 |