 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 |
 yuanke
|
9446760258
|
Merge branch 'weixin_guange' into develop
Conflicts:
db/schema.rb
|
2016-08-14 09:56:17 +08:00 |
|
huang
|
d7faed7f6d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-13 15:39:06 +08:00 |
|
cxt
|
35260f2f6d
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-08-13 15:36:48 +08:00 |
|
cxt
|
2759d562ac
|
首页项目列表
|
2016-08-13 15:35:03 +08:00 |
|
huang
|
37df983009
|
项目列表
|
2016-08-13 11:13:11 +08:00 |
|
cxt
|
951390092b
|
我的作业报500
|
2016-08-11 15:59:38 +08:00 |
|
cxt
|
80b8fc4444
|
“我的作业”中有挂起的作业时会报500
|
2016-08-11 14:44:43 +08:00 |
|
yuanke
|
ea926395c3
|
Merge branch 'develop' into weixin_guange
|
2016-08-11 11:19:52 +08:00 |
|
cxt
|
7edb30754b
|
student_works添加字段commit_time，记录学生作品实际的提交时间
|
2016-08-10 16:50:27 +08:00 |
|
yuanke
|
57737ff15d
|
微信细节优化
|
2016-08-10 16:08:30 +08:00 |
|
cxt
|
9594aada50
|
Merge branch 'cxt_course' into develop
Conflicts:
public/javascripts/application.js
|
2016-08-09 16:42:23 +08:00 |
|
cxt
|
a3011c319b
|
我的题库显示我的所有作业
|
2016-08-09 16:40:56 +08:00 |
|
cxt
|
6c9a4a6620
|
首页的左侧项目栏无法展开
|
2016-08-09 10:38:44 +08:00 |
|
cxt
|
0d86a28c54
|
我的作业
|
2016-08-05 16:12:53 +08:00 |
|
cxt
|
6c7b53f7d4
|
首页左侧栏
|
2016-08-04 11:05:34 +08:00 |
|
cxt
|
cecf917764
|
从题库选用作业时增加提示：“您选中的题是“我收到的作业”，不能选用”
|
2016-08-03 15:00:16 +08:00 |
|
cxt
|
acc3ba121f
|
测试集的显示、新版分页
|
2016-08-03 13:46:59 +08:00 |
|
cxt
|
718b13e6c1
|
新版题库
|
2016-08-03 11:12:55 +08:00 |
|
cxt
|
335b82c046
|
加入班级的弹框
|
2016-07-29 19:19:58 +08:00 |
|
cxt
|
a0f2f518cf
|
回复他人的博客首页不应跳到自己的博客首页
|
2016-07-26 17:45:59 +08:00 |