Commit Graph

68 Commits

Author SHA1 Message Date
cxt e29eb67f68 课程列表中删除课程确认弹框中“关闭”改为“取消” 2016-12-17 10:07:51 +08:00
cxt 90c3c33dd4 ke编辑的样式与显示样式不一致 2016-12-13 11:07:03 +08:00
cxt 785f027a63 Merge branch 'cxt_course' into develop 2016-11-25 14:56:24 +08:00
cxt 6a6dda2ec3 课程大纲:如图“归档”按钮显示换行了 2016-11-25 10:39:24 +08:00
cxt 8743460134 动态与详情的回复叠层调整 2016-11-25 09:59:03 +08:00
cxt 4388b7625e 首页班级列表的归档 2016-11-21 16:58:25 +08:00
cxt 149ecc0b99 只有班级创建者才能归档和恢复 2016-11-18 17:32:45 +08:00
cxt 1fcb1db27c 课程大纲下的班级归档 2016-11-18 15:34:53 +08:00
cxt 4a266b33e6 新建课程增加示例,并追加班级的说明tip 2016-11-11 17:26:38 +08:00
cxt d1bfdde261 班级名称命名和显示规范调整 2016-11-11 15:19:22 +08:00
cxt 94284e72a2 弹框样式调整、
课程大纲的提示,在操作文字的前后应该各空一格、
作品列表的各种提示未知需要对齐、
评分设置等新弹框:如图当鼠标移至右上角关闭图标,图标丢失、
2016-11-04 18:43:44 +08:00
cxt 78ca68b5e3 Merge branch 'cxt_course' into develop
Conflicts:
	public/stylesheets/css/moduel.css
	public/stylesheets/css/public.css
2016-11-04 16:15:56 +08:00
cxt a9265f3b35 课程大纲缺少创建班级才能开展教学的引导说明 2016-11-04 13:55:29 +08:00
huang d5e2ae9407 Merge branch 'cxt_course' into develop 2016-10-28 18:42:29 +08:00
cxt 557f5d4e26 新建班级、新建课程的提示 2016-10-28 18:36:35 +08:00
yuanke 93ed72fb59 Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-10-28 15:57:53 +08:00
cxt 15b6aaf2a2 新建班级、新建课程增加tip说明 2016-10-25 13:21:01 +08:00
Tim 20bba5bfe5 课程中不能删除创建班级教室title模拟 2016-10-21 15:37:26 +08:00
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