Commit Graph

50 Commits

Author SHA1 Message Date
cxt 5fb7da4681 Merge branch 'cxt_course' into develop
Conflicts:
	public/stylesheets/css/public.css
2016-10-13 14:17:54 +08:00
cxt 018a27f307 课程大纲的教师团队:创建班级数与参与班级数均为该老师在本课程下的创建班级数与参与班级数 2016-10-13 14:05:50 +08:00
Tim c693afdee8 project.css去重,提取到public.css 2016-10-11 17:26:36 +08:00
cxt 2cc2d8e562 课程班级列表的“加入班级”样式调整 2016-10-09 16:05:36 +08:00
cxt 7a72e7e839 课程大纲的附件样式 2016-10-08 19:07:52 +08:00
cxt 4aca50e62d 超级管理员可以给课程添加教师 2016-10-08 16:46:59 +08:00
cxt ed05880653 https的链接转换 2016-10-08 16:22:37 +08:00
cxt 9d65d61f2a 教师团队中只有一个教师时不应有上移功能 2016-10-08 15:56:43 +08:00
cxt 7f3bb0be63 教师团队中上移、下移功能的完善 2016-10-08 13:54:35 +08:00
cxt bee9dfa1b5 课程下的班级列表图片丢失 2016-10-08 10:38:12 +08:00
cxt 843aacc143 课程大纲自动识别URL 2016-10-08 10:25:19 +08:00
cxt 492f734a76 课程教师团队的“添加成员” 2016-09-23 18:50:40 +08:00
cxt e1ce5d2305 教师团队的删除判断、“增加教师”链接跳转时展开添加成员 2016-09-23 18:34:03 +08:00
cxt caf5602389 课程大纲教师团队的管理 2016-09-23 09:22:47 +08:00
Tim 862bbd1a1f 班级名称前增加课程名,一系列更改 2016-09-09 15:49:31 +08:00
Tim b796ac3b53 Merge branch 'develop' into cxt_course
Conflicts:
	app/views/exercise/_student_table.html.erb
	db/schema.rb
2016-09-09 13:30:10 +08:00
cxt b3f738ee5d 与班级相关平台班级名称规范调整 2016-09-09 10:23:18 +08:00
Tim 95824e3b6b 新建课程增加名称正确错误示例,课程说明 2016-09-07 11:24:38 +08:00
cxt ad0acb5188 课程大纲的内容图片自适应大小 2016-09-05 14:31:49 +08:00
cxt 8494d71e8e “课程名称”不显示,英文名称为空时不显示“课程英文名称” 2016-08-31 14:33:29 +08:00
cxt 076feb17e8 课程大纲的班级列表中的“主讲老师”改为“创建老师” 2016-08-31 14:12:04 +08:00
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