Commit Graph

29 Commits

Author SHA1 Message Date
cxt a1a2b3dd33 Merge branch 'rep_quality' into cxt_course
Conflicts:
	db/schema.rb
2016-07-29 14:36:18 +08:00
cxt a1149c1104 班级列表的公开私有 2016-07-27 14:07:16 +08:00
daiao 6ab2c15504 修复先删除课程下的某班级,再删除该课程报错 2016-07-26 10:38:04 +08:00
cxt 1e0ed2bfba 新建课程和班级时的占位符需要更改 2016-07-25 14:54:57 +08:00
cxt 0564ddb6ea 课程大纲的回复 2016-07-25 13:56:26 +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 6c7925a7b4 样式调整 2016-07-22 18:20:11 +08:00
cxt 6d4835c6cc 样式调整 2016-07-22 17:13:40 +08:00
cxt 1e28ff880d 新版课程大纲 2016-07-22 10:20:28 +08:00
daiao b7cf7a2468 Merge branch 'develop' into daiao_dev 2016-07-21 09:55:47 +08:00
Tim e966972750 Merge branch 'develop' into cs_optimize_txz
Conflicts:
	app/views/versions/index.html.erb
2016-07-18 14:32:17 +08:00
cxt b7e6725e1f 管理员界面的课程名称双击可点击 2016-07-15 14:48:39 +08:00
Tim a0db221ffc Merge branch 'develop' into cs_optimize_txz 2016-07-11 13:57:04 +08:00
daiao 670b443cc4 Merge branch 'develop' into daiao_dev 2016-07-11 10:38:46 +08:00
daiao 5c4e4e7c8a 修复删除班级后再删除课程,提示错误的问题 2016-07-07 16:55:34 +08:00
cxt 3b418bc44c 如果未登陆,在资源列表最上面增加一个提示句(必须全局统一:您尚未登录,登录后可浏览更多信息),“登录”可做成链接。 2016-07-07 16:46:41 +08:00
cxt 290abeeaa4 班级名称的显示 2016-07-07 15:36:08 +08:00
cxt 37dd447fcb Merge branch 'daiao_dev' into cxt_course
Conflicts:
	app/views/admin/courses.html.erb
	public/stylesheets/new_user.css
2016-07-07 15:14:11 +08:00
Tim b02c1b5995 提交与取消按钮之间增加间距;新建问卷"选项D"文字折行;日历图标样式调整,问题跟踪日历前input宽度缩减; 2016-07-07 15:08:34 +08:00
cxt da7509f64c 课程大纲的优化 2016-07-07 15:04:57 +08:00
daiao db3056f1b1 隐藏班级列别的创建时间和创建名称! 2016-07-06 09:22:20 +08:00
yuanke 447e624f36 课程大纲bug修复 2016-07-01 21:38:37 +08:00
cxt 6867a88a94 课程大纲样式调整 2016-07-01 16:41:13 +08:00
cxt 0ff8f0a774 课程大纲的删除和课程大纲描述的删除 2016-07-01 16:25:52 +08:00
cxt 25b5d74a42 课程大纲的修改 2016-07-01 15:25:30 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00
cxt ebb697a49f 班级列表、课程大纲的编辑、回复、课程列表 2016-06-30 10:44:11 +08:00
cxt e066445036 课程大纲的显示和编辑 2016-06-29 10:45:56 +08:00
cxt 383483de26 课程大纲的左侧栏base,新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +08:00