Commit Graph

1752 Commits

Author SHA1 Message Date
cxt 812481d5fa 非班级成员邀请码显示为***** 2016-07-25 14:49:08 +08:00
cxt 0564ddb6ea 课程大纲的回复 2016-07-25 13:56:26 +08:00
cxt 6c7925a7b4 样式调整 2016-07-22 18:20:11 +08:00
cxt 45fb2d0a3e Merge branch 'develop' into cxt_course 2016-07-22 17:14:28 +08:00
cxt 6d4835c6cc 样式调整 2016-07-22 17:13:40 +08:00
huang 0e1a52726f Merge branch 'cxt_course' into develop
Conflicts:
	app/views/layouts/base_syllabus.html.erb
2016-07-22 16:46:01 +08:00
cxt 27afee03b2 编辑课程的英文名称时输入框不清空 2016-07-22 16:38:09 +08:00
cxt 6b1116dfd1 课程的回复和名称的编辑 2016-07-22 16:00:56 +08:00
cxt 9422e2886c 新版班级主页 2016-07-22 15:32:37 +08:00
cxt 1e28ff880d 新版课程大纲 2016-07-22 10:20:28 +08:00
Tim 53c515b8d1 课程大纲侧导航js控制 2016-07-21 10:28:50 +08:00
Tim 78e4d37d8b 大纲base页引入弹框样式;作业列表调整 2016-07-20 15:09:01 +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 2d1d3083d0 引入project.css 2016-07-15 09:51:14 +08:00
Tim c41a116378 博客上传附件后,编辑处文件夹图标显示;大纲引用css样式更改 2016-07-14 17:00:38 +08:00
cxt 9bf853d2bb 管理员可修改课程名称和英文名称 2016-07-13 09:49:24 +08:00
cxt 16cf8a56a1 管理员和老师可看到课程下的所有班级 2016-07-13 09:34:36 +08:00
Tim 73b7b00db9 班级学生列表导航栏下拉框错位调整 2016-07-12 16:45:04 +08:00
cxt f0e456729e 过滤掉消息中的html 2016-07-12 16:21:30 +08:00
Tim a0db221ffc Merge branch 'develop' into cs_optimize_txz 2016-07-11 13:57:04 +08:00
cxt c224f97905 样式调整、线下作业的作品评分、导出作业成绩报500 2016-07-08 15:02:50 +08:00
cxt 290abeeaa4 班级名称的显示 2016-07-07 15:36:08 +08:00
cxt 3b91adf689 课程大纲内的编辑图标的显示与隐藏 2016-07-07 15:28:33 +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
cxt da7509f64c 课程大纲的优化 2016-07-07 15:04:57 +08:00
daiao c621602050 修复当鼠标移至区域内才会显示icon 2016-07-07 15:02:02 +08:00
cxt a99b03ff76 管理员界面增加配置课程 2016-07-07 09:02:41 +08:00
Tim 75475b6058 个人主页,课程,项目样式更新 2016-07-06 15:43:48 +08:00
daiao ad36a1b29e 修复课程下编辑框英文换行缺陷 2016-07-06 09:07:50 +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 3ccdf7f9ae 课程问答区,项目讨论区的帖子消息通知应直接打开对应的帖子详情界面 2016-07-05 15:00:41 +08:00
cxt 17a2686d42 班级左侧头部信息的样式调整 2016-07-05 11:22:58 +08:00
cxt 23eefc2b7f 班级主页:建议将如图所示适当往上调一点,与左侧头像对齐 2016-07-05 10:15:24 +08:00
yuanke 447e624f36 课程大纲bug修复 2016-07-01 21:38:37 +08:00
cxt e834d09469 Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-07-01 17:52:29 +08:00
cxt 5a1090c0e1 bug修复 2016-07-01 17:27:34 +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 18d677c5eb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/courses.css
2016-07-01 11:31:51 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00
yuanke 397c4cc2a5 1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮 2016-06-30 16:08:36 +08:00
Tim ba1db91a1e css优化调整 2016-06-30 15:38:00 +08:00
cxt ac4218bfb0 课程大纲列表 2016-06-30 15:36:46 +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
cxt 76e7c50bf4 Merge branch 'cxt_course' into develop
Conflicts:
	app/views/users/_reply_to.html.erb
2016-06-24 16:52:00 +08:00
cxt afc8fad7fd 通过邀请码加入课程 2016-06-24 16:12:24 +08:00