Commit Graph

2114 Commits

Author SHA1 Message Date
huang 00784e6587 个人主页指派给为空链接去掉 2016-10-28 19:13:09 +08:00
yuanke 93ed72fb59 Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-10-28 15:57:53 +08:00
huang fe9731c11c MESSAGE中描述 2016-10-28 15:32:05 +08:00
huang 45c83a2219 讨论区标题过短问题 2016-10-28 15:08:06 +08:00
yuanke abbf39848b Merge branch 'yuanke_youhua' into develop 2016-10-28 13:23:59 +08:00
huang 3ef90a3c62 Merge branch 'dev_newproject' into develop
Conflicts:
	db/schema.rb
2016-10-27 17:33:28 +08:00
daiao f945896e06 还原 二级回复宽度 2016-10-27 17:32:20 +08:00
daiao 5089d2f9fd 里程碑列表排序,Issue详情回复宽度 2016-10-27 17:24:28 +08:00
huang ec5645fc66 完成项目动态中样式别别的地方冲突问题 2016-10-27 14:57:12 +08:00
yuanke 5d3ab1bb09 优化头像地址获取代码、屏蔽头像card代码 2016-10-27 14:30:07 +08:00
huang c4b32438ee 动态样式冲突问题 2016-10-27 11:16:51 +08:00
Tim e3fc304d35 项目动态回复栏展开更多时,回复框宽度扩展问题 2016-10-27 10:06:58 +08:00
huang 0e15ac00be 动态中链接为空问题 2016-10-27 09:27:48 +08:00
cxt 51e422c1a6 个人留言、课程留言的主留言增加自动保存 2016-10-26 16:12:51 +08:00
huang a0ff6a0cb1 完成项目讨论区的拉宽工作 2016-10-25 14:47:05 +08:00
cxt 891c0018e5 多层回复时的展现方式调整 2016-10-25 13:56:25 +08:00
Tim 1023f5301e 讨论区列表、讨论区详情、讨论区回复宽度扩展 2016-10-25 09:11:56 +08:00
cxt 40a895a786 issue动态附件点击后下载更新为直接查看 2016-10-24 10:57:40 +08:00
yuanke b7cd1e8fa2 Merge branch 'cxt_course' into develop 2016-10-21 19:59:37 +08:00
cxt fefc1bf800 分組作业的动态和详情的调整、作品列表增加项目提示和老师加入项目的功能 2016-10-21 19:58:02 +08:00
Tim a9a36d655e 提价作业界面长单词不折行bug 2016-10-21 19:33:08 +08:00
Tim f4690f0cab 回复,二级回复,删除时,回复框宽度控制 2016-10-21 11:09:54 +08:00
cxt f9505a24b9 题库发送的提示语不正确:应该是目标班级,而不是目标课程: 2016-10-21 08:59:16 +08:00
huang 786110f711 还原 2016-10-20 13:31:05 +08:00
huang 1b8bf05be5 用户ID装换成用户名 2016-10-20 13:26:11 +08:00
cxt 6109a1602b Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-10-19 18:11:02 +08:00
cxt 800aaf8853 隐藏博客首页 2016-10-19 18:07:19 +08:00
cxt e102815f60 个人主页 2016-10-19 18:03:59 +08:00
huang 89292054c8 项目动态讨论区模块独立出来 2016-10-19 09:57:17 +08:00
huang b8d86fcd42 版本库界面及样式 2016-10-19 15:24:36 +08:00
Tim 5844af922e 项目动态宽度扩展 2016-10-18 13:34:28 +08:00
Tim 16bedc3d8f 项目资源库弹窗位置及样式js控制 2016-10-15 15:47:48 +08:00
Tim ee03cda8a6 班级资源库弹窗样式及位置js控制 2016-10-15 15:34:33 +08:00
cxt 5870c3eaaf 子栏目讨论区列表的排序、作品内容的样式调整 2016-10-14 18:24:54 +08:00
cxt a1b70a7e91 Merge branch 'cxt_course' into develop 2016-10-14 16:18:12 +08:00
huang b9d87b1b29 Merge branch 'develop' into rep_quality
Conflicts:
	public/stylesheets/css/project.css
2016-10-14 15:43:45 +08:00
cxt 12ad7c1612 班级讨论区增加二级子栏目 2016-10-14 14:28:19 +08:00
yuanke 7dc0ba005e Merge branch 'dev_shcool' into develop
Conflicts:
	app/views/issues/index.html.erb
	app/views/users/_course_newslist.html.erb
2016-10-13 14:37:37 +08:00
cxt d2b6d81373 Merge branch 'cxt_replies' into develop
Conflicts:
	app/views/blog_comments/show.html.erb
	app/views/blogs/_article.html.erb
	app/views/org_document_comments/show.html.erb
2016-10-13 14:22:05 +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 59f2478cae 首页动态过滤 “课程动态” -》“班级动态” 2016-10-13 11:25:26 +08:00
huang dd4d20011d 公共资源库显示优化 2016-10-13 09:43:53 +08:00
cxt a581f989c9 给messages、journals_for_messages、blog_comments、org_document_comments表增加root_id,优化平台的回复 2016-10-11 14:08:44 +08:00
daiao 61b07e3f13 资源库,公有资源/我的资源中,根据大小,下载数,上传时间排序时,箭头样式不对 2016-10-11 09:53:27 +08:00
cxt 87050a2adf 挂起的作业报500 2016-09-30 17:49:01 +08:00
cxt ec0d21b243 戴傲项目相关 2016-09-30 17:27:30 +08:00
cxt db9d4900ac Merge branch 'cxt_course' into develop 2016-09-30 16:48:05 +08:00
cxt f1b9a98084 编辑作业报500 2016-09-30 16:32:12 +08:00
cxt b28579a3a3 Merge branch 'cxt_course' into develop 2016-09-30 14:49:57 +08:00
cxt a63f58de5b 动态代码的优化 2016-09-30 14:48:42 +08:00