Commit Graph

185 Commits

Author SHA1 Message Date
huang cfc5a2457c 课程500问题 2016-09-17 11:26:29 +08:00
cxt 1bd93904af Merge branch 'cxt_course' into develop 2016-09-14 19:47:24 +08:00
cxt e4efc8c302 作业编辑 2016-09-14 16:45:10 +08:00
huang 89de36ec65 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 15:24:02 +08:00
daiao e508cba951 1.游客进入班级,资源出现了两个入口 2016-09-14 15:10:26 +08:00
huang 2222776a26 课程推荐代码简化 2016-09-14 11:02:28 +08:00
cxt 72977886c7 Merge branch 'cs_optimize_txz' into cxt_course
Conflicts:
	app/views/layouts/_course_base_info.html.erb
2016-07-29 19:37:15 +08:00
cxt 335b82c046 加入班级的弹框 2016-07-29 19:19:58 +08:00
cxt a1a2b3dd33 Merge branch 'rep_quality' into cxt_course
Conflicts:
	db/schema.rb
2016-07-29 14:36:18 +08:00
cxt 848c56d54e 班级主页身份切换、成员管理页面的多重身份 2016-07-29 14:34:42 +08:00
cxt 1f8fa1c70a 班级动态去掉“>” 2016-07-26 17:16:42 +08:00
cxt 04207609cb 未配置课程的班级打开报500 2016-07-26 16:54:34 +08:00
daiao 4646d13234 1.修改资源课程名称,竟可能显示全。
2.班级动态下,去掉“班级动态>”
2016-07-25 18:54:44 +08:00
daiao 9ff728f080 Merge branch 'develop' into daiao_dev
Conflicts:
	app/views/layouts/_syllabus_base_info.html.erb
2016-07-25 10:03:50 +08:00
cxt 9422e2886c 新版班级主页 2016-07-22 15:32:37 +08:00
daiao 03d6afd1c4 优化上周动态获取代码 2016-07-18 15:52:04 +08:00
cxt da7509f64c 课程大纲的优化 2016-07-07 15:04:57 +08:00
cxt c5840d75da Merge branch 'daiao_dev' into cxt_course
Conflicts:
	db/schema.rb
2016-07-05 16:49:50 +08:00
cxt ac4218bfb0 课程大纲列表 2016-06-30 15:36:46 +08:00
cxt 383483de26 课程大纲的左侧栏base,新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +08:00
guange c501af70ba . 2016-06-27 11:09:25 +08:00
guange d348981721 加入邀请码 2016-06-24 13:29:36 +08:00
cxt 766026e3cf 教师评分为最终评分 2016-04-27 16:21:35 +08:00
cxt 5e1284605f Merge branch 'hjq_beidou' into cxt_course
Conflicts:
	app/views/layouts/new_base_user.html.erb
2016-04-14 11:29:26 +08:00
cxt 062af3c57a 作业积分出现负分 2016-04-13 16:11:57 +08:00
huang 8f0038c3ff tag 2016-03-25 17:06:59 +08:00
huang ff2340baf9 课程统计信息优化 2016-03-25 10:42:26 +08:00
huang cb4b26762d 课程base优化 2016-03-25 09:56:45 +08:00
huang bff20ee072 英雄榜数据显示问题 2016-03-18 14:16:23 +08:00
cxt 98f7ad19f6 Merge branch 'linchun' into develop 2016-03-11 19:34:33 +08:00
linchun 8c145c9d39 Merge branch 'develop' into linchun
Conflicts:
	db/schema.rb
2016-03-11 17:25:30 +08:00
cxt ef5625ccdf 延期发布的课程资源设为公开后不应对学生可见 2016-03-11 11:17:44 +08:00
cxt 0d8052da28 老师把学生加入某一个分班 2016-03-10 17:04:26 +08:00
linchun 3e70db4e82 Merge branch 'develop' into linchun
Conflicts:
	db/schema.rb
2016-03-08 11:29:58 +08:00
huang d6dedf03cb 去掉puts注释 2016-03-06 12:18:57 +08:00
huang d30e73795d 积分规则 2016-03-06 12:15:57 +08:00
linchun bb8a6af13e admin界面添加精品课程页面,目前该页面中的精品课程是固定的 2016-03-04 15:31:40 +08:00
huang 97e6299a2b Merge branch 'hjq_new_course' into develop
Conflicts:
	app/views/layouts/_logined_header.html.erb
2016-03-04 09:33:38 +08:00
huang fee7cc4b2c 课程推荐中不显示私有课程 2016-03-03 18:10:30 +08:00
cxt f0d7542ac6 个人题库和公共题库 2016-03-03 17:04:38 +08:00
cxt a2e60944be 已发布资源的延期发布 2016-02-23 11:04:19 +08:00
cxt 98946b9855 课程上传资源弹框的延迟发布功能 2016-02-22 18:10:20 +08:00
cxt e04e80d64d 跨越多个学期的课程学期的显示 2016-02-20 16:18:28 +08:00
cxt e9a7f6f826 导出学生作业成绩列表 2016-01-29 11:02:57 +08:00
cxt af7ca36c92 学生加入课程或退出课程 2016-01-26 15:59:39 +08:00
huang 154417378e 精品课程默认推荐 2016-01-24 10:58:58 +08:00
huang 49d0d214de 精品课程默认排序 2016-01-24 08:48:38 +08:00
huang ea6a78893f Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-22 17:29:33 +08:00
cxt 338c224846 课程配置页面的结束学期可修改 2016-01-22 15:17:11 +08:00
huang 0db69e1ebf 解决课程导语时间和课程创建动态时间一致的问题 2016-01-20 16:32:47 +08:00