Commit Graph

698 Commits

Author SHA1 Message Date
cxt aaefd8b4aa Merge branch 'cxt_course' into develop
Conflicts:
	app/views/users/_news_replies.html.erb
2016-09-02 15:24:55 +08:00
Tim d0a2ea02f2 学生列表名字学号过长省略号显示;课程教师团队名称过长省略号显示 2016-09-02 14:27:49 +08:00
cxt a8575f2a15 暂时隐藏个人名片 2016-08-31 14:08:19 +08:00
cxt 623dadaea1 回复的删除按钮当鼠标放上去才显示 2016-08-30 14:12:50 +08:00
cxt cdffaed1ea 班级主页设置班级为公开私有时刷新资源库页面 2016-08-26 15:11:57 +08:00
cxt eb20ca4ffe 新建班级时班级名称实例要加上课程名称 2016-08-26 14:56:29 +08:00
cxt 774b5eca89 课程和项目的头像点击可编辑 2016-08-26 14:31:14 +08:00
cxt b33136c59b 班级问答区改成讨论区 2016-08-25 15:59:09 +08:00
Tim 56452d69f4 侧导航字体大小,颜色更改 2016-08-05 14:11:35 +08:00
Tim 08b8e3f1cb 加入班级,项目弹框定位js重写 2016-08-01 15:21:23 +08:00
cxt 335b82c046 加入班级的弹框 2016-07-29 19:19:58 +08:00
cxt a1553c7a8f 角色的修改 2016-07-29 16:27:02 +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 0dfc887f74 复制班级中资源的提示修改 2016-07-27 16:43:27 +08:00
cxt aafe0aa4ae 删除班级留言时左侧导航栏的样式问题 2016-07-27 10:20:27 +08:00
daiao 4646d13234 1.修改资源课程名称,竟可能显示全。
2.班级动态下,去掉“班级动态>”
2016-07-25 18:54:44 +08:00
cxt 1e0ed2bfba 新建课程和班级时的占位符需要更改 2016-07-25 14:54:57 +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 dc9c0f924b 教师列表和学生列表的样式 2016-07-22 18:39:50 +08:00
cxt 48d5b89338 课程推荐为0的不显示 2016-07-22 18:26:48 +08:00
cxt 6c7925a7b4 样式调整 2016-07-22 18:20:11 +08:00
cxt 6d4835c6cc 样式调整 2016-07-22 17:13:40 +08:00
cxt 808b553e43 班级动态只有10条,底部却显示“点击展开更多” 2016-07-22 16:50:32 +08:00
cxt 9422e2886c 新版班级主页 2016-07-22 15:32:37 +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
daiao 03d6afd1c4 优化上周动态获取代码 2016-07-18 15:52:04 +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
yuanke 6ae57ef23a Merge branch 'weixin_guange' into develop 2016-07-15 19:53:33 +08:00
cxt 7ea5d7d934 新建班级页面,提示“如果列表中没有对应的课程,请您先创建课程”始终显示 2016-07-15 10:21:59 +08:00
yuanke 6ab1269c01 修改微信反馈框加入重复班级提示有误的问题 2016-07-15 09:16:37 +08:00
daiao 304f18ac5e 修复课程中,对动态进行筛选的页面呈现方式 2016-07-12 15:05:42 +08:00
cxt 955c258856 复制班级的弹框中“课程名称”下拉框中只显示当前登录用户的所有课程 2016-07-12 10:35:52 +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 41fc812ca4 修复班级配置--添加成员:用户名称太长的问题 2016-07-07 17:34:38 +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
Tim b91d6a3273 班级动态筛选框样式调整 2016-07-05 16:31:36 +08:00
Tim 1658f78a7b Merge branch 'develop' into cs_optimize_txz
Conflicts:
	app/views/layouts/new_base.html.erb
	app/views/layouts/new_base_user.html.erb
	app/views/users/_user_resource_info.html.erb
2016-07-05 15:38:56 +08:00
cxt eff4780ea9 去掉班级配置页面的自动填充 2016-07-05 14:29:42 +08:00
yuanke 447e624f36 课程大纲bug修复 2016-07-01 21:38:37 +08:00
yuanke 70e26927cb 班级中的课程字样改为班级 2016-07-01 20:38:33 +08:00
cxt 8b87c141cc bug修复 2016-07-01 17:47:35 +08:00
cxt 5a1090c0e1 bug修复 2016-07-01 17:27:34 +08:00
cxt 6867a88a94 课程大纲样式调整 2016-07-01 16:41:13 +08:00
cxt 25b5d74a42 课程大纲的修改 2016-07-01 15:25:30 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00