Commit Graph

769 Commits

Author SHA1 Message Date
daiao d65a062737 所有我的issue功能 2016-11-17 17:02:02 +08:00
daiao e956d20d6e 我的issue部分功能 2016-11-16 16:57:02 +08:00
daiao acffe8ec19 我的issue未完 2016-11-16 11:26:17 +08:00
huang 0adde560ba 我的issue路由修改及查询修改 2016-11-15 14:30:01 +08:00
huang 11f8656651 0 2016-11-15 11:20:30 +08:00
huang 5f21b63c41 我的issue框架搭建 2016-11-15 10:47:07 +08:00
huang 3561009efc Merge branch 'develop' into dev_newproject 2016-11-15 09:01:45 +08:00
cxt edf8ceed7c 取消收藏的班级和项目动态不显示 2016-11-14 16:37:42 +08:00
huang f08b04d645 My Issue未完 2016-11-14 16:06:54 +08:00
huang d1f9ce3ab2 课程中资源库导入不能用 2016-11-11 18:19:03 +08:00
huang 0f328c9c58 解决用户ID转换成用户名后引发的问题 2016-11-10 10:27:57 +08:00
cxt f921c8cccc 发布作业时默认教师优先、迟交扣分为0、缺评扣分为0 2016-11-04 18:54:51 +08:00
huang 3ef90a3c62 Merge branch 'dev_newproject' into develop
Conflicts:
	db/schema.rb
2016-10-27 17:33:28 +08:00
huang ec5645fc66 完成项目动态中样式别别的地方冲突问题 2016-10-27 14:57:12 +08:00
huang c4b32438ee 动态样式冲突问题 2016-10-27 11:16:51 +08:00
huang 6b8184ed49 issue模块新版二级回复ajax刷新 2016-10-21 13:27:41 +08:00
cxt bee1597167 删除的个人主页报500 2016-10-20 15:01:05 +08:00
cxt 269083c4a6 分组作业的评分设置 2016-10-20 14:24:07 +08:00
cxt 6109a1602b Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-10-19 18:11:02 +08:00
cxt e102815f60 个人主页 2016-10-19 18:03:59 +08:00
cxt ce1da89e02 Merge branch 'cxt_replies' into develop 2016-10-14 16:18:43 +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 5f04baf572 博客动态回复显示:“展开更多”、“收起回复”点击无反应 2016-10-14 15:09:47 +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 b8296f3e7e 首页的课程列表显示缺漏 2016-10-13 14:08:20 +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
huang 351ca6d074 Merge branch 'rep_quality' into develop
Conflicts:
	app/views/layouts/_logined_header.html.erb
2016-10-08 10:41:05 +08:00
cxt a9a53caa13 学生提交作品后,跳转至“作品列表”,而不是“作业信息” 2016-09-30 10:29:42 +08:00
daiao fdca4ea968 项目与班级资源库导入资源重名时导入异常 2016-09-28 16:52:02 +08:00
cxt 4db59ea0d3 我的题库 切换两次后作业丢失链接 2016-09-26 15:07:25 +08:00
cxt ba4a1c64d9 作业动态的重构 2016-09-19 17:14:14 +08:00
cxt fa82860813 项目讨论区动态的过滤 2016-09-18 17:01:08 +08:00
cxt 6c093f68cf 班级内的成员可以将帖子、通知、资源等发送到该班级 2016-09-18 11:18:02 +08:00
cxt 9002844188 新版发布作业 2016-09-13 16:18:57 +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 cf25dc8dfd 首页的项目列表 2016-09-08 15:00:20 +08:00
cxt e6ddb3cec0 个人主页动态过滤中点击全部动态要显示当前用户关联的所有动态 2016-09-07 11:30:26 +08:00
daiao cdd4dfcf09 项目列表中:私有项目对非成员显示,非成员不点击进入 2016-09-05 16:55:56 +08:00
daiao 3dc0e8407a Merge branch 'develop' into dev_shcool
Conflicts:
	app/views/organizations/_org_member_list.html.erb
	app/views/organizations/setting.html.erb
	app/views/users/_project_news.html.erb
2016-09-05 13:47:39 +08:00
cxt 22e914eec2 查看他人的留言动态报500 2016-09-02 16:42:19 +08:00
cxt aaefd8b4aa Merge branch 'cxt_course' into develop
Conflicts:
	app/views/users/_news_replies.html.erb
2016-09-02 15:24:55 +08:00
cxt ded6753ce1 访问他人的主页只显示他本人的动态 2016-09-02 14:23:02 +08:00
cxt e61cf5dd4f 多重身份的成员:教师模拟答题和学生答题作为两条记录 2016-09-01 14:21:19 +08:00
huang 52a8a64a69 项目隐藏 项目讨论区发送中去掉课程 2016-09-01 10:48:13 +08:00
daiao 548a263f0f 1.修复项目新闻发送至其他项目后,位于讨论区下的bug
2.资料未完善情况下,“修改资料”可操作
3.组织成员列表增加分页功能(配置成员页面分页为完成)
4.修复回复表情显示不对
2016-08-31 17:09:02 +08:00
cxt 60beb2abab 首页左侧班级和项目列表的收藏功能 2016-08-25 11:30:47 +08:00
cxt 56b74b755b 取消收藏 2016-08-24 17:30:30 +08:00
cxt b8dc444cc7 普通作业和编程作业在题库发送后,编辑并进行发布,没有自动创建作品列表
复制班级功能里,勾选“作业”,同上

对应方法:在作业的发布时间点(不用考虑作业是通过何种途径生成的),除了发布作业外,应该为该作业自动创建完整的作品列表(分组作业除外)
2016-08-23 10:17:08 +08:00