 cxt
|
695e870a26
|
作品的统计不见了
|
2016-05-13 17:30:05 +08:00 |
|
cxt
|
66c410884f
|
作业是否需要请求分享，只判断了用户是否属于课程，未判断作业创建者的ID，如果用户不在某个课程了，则变成需要自己向自己申请作业，且【我的题库】也不显示自己之前创建的作业了。
|
2016-05-13 17:11:53 +08:00 |
|
cxt
|
8af0459519
|
首页动态中不应出现已删除的课程动态
|
2016-05-12 16:56:50 +08:00 |
|
cxt
|
582c305a47
|
申请引用过的作业在课程删除后不应该在申请题库中显示
|
2016-05-12 16:29:39 +08:00 |
|
cxt
|
b3782c5d0c
|
合并代码
|
2016-05-12 10:47:07 +08:00 |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
2016-05-12 10:40:35 +08:00 |
|
cxt
|
f4b8f2c794
|
学生追加附件发送消息
|
2016-05-12 10:29:43 +08:00 |
 huang
|
922958e732
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-05-11 16:23:58 +08:00 |
|
cxt
|
d4a35b94f6
|
导出的作品成绩保存为数字格式
|
2016-05-11 14:51:49 +08:00 |
|
cxt
|
9bc8ccbb9e
|
教辅可只评语不评分
|
2016-05-11 09:18:55 +08:00 |
|
cxt
|
5baf467d13
|
作品评分不覆盖
|
2016-05-10 15:26:08 +08:00 |
 yuanke
|
629591ad00
|
课程、项目列表更新时间取动态表中的
|
2016-05-10 12:55:42 +08:00 |
|
cxt
|
d303a06377
|
首页列表的排序
|
2016-05-10 11:32:20 +08:00 |
|
cxt
|
f6d7df7393
|
管理员界面添加“分享作业申请”列表
|
2016-05-09 18:40:21 +08:00 |
|
cxt
|
1eb41478b2
|
课程动态和首页动态中的作业动态实现二级回复
|
2016-05-09 17:06:10 +08:00 |
|
cxt
|
644e097dc8
|
定时更新关联项目的作业更新时间
|
2016-05-09 16:16:03 +08:00 |
|
cxt
|
1b309d4bf0
|
时间的比较
|
2016-05-09 10:36:38 +08:00 |
|
cxt
|
7b84c994e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-09 10:32:48 +08:00 |
|
cxt
|
fc95d048a5
|
作业列表打不开
|
2016-05-09 10:32:41 +08:00 |
|
huang
|
18b70e9dd3
|
上线问题
|
2016-05-06 22:59:46 +08:00 |
|
cxt
|
e03bc42c53
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/words_controller.rb
|
2016-05-06 22:53:16 +08:00 |
|
cxt
|
2a55d8f0c3
|
作业的回复更新作业的updated_at字段
|
2016-05-06 22:23:05 +08:00 |
|
cxt
|
9526962c69
|
翻页时不更新作业动态
|
2016-05-06 22:06:24 +08:00 |
|
cxt
|
b8f7672424
|
项目动态的更新时间更新到作业动态中
|
2016-05-06 22:02:45 +08:00 |
|
huang
|
00d0bc0ce1
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-05-06 22:02:22 +08:00 |
|
cxt
|
b0f407aae5
|
去掉导出的作业成绩中的作品描述的html代码
|
2016-05-06 20:19:16 +08:00 |
|
huang
|
0a989daf31
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
public/stylesheets/courses.css
public/stylesheets/new_user.css
|
2016-05-06 18:12:08 +08:00 |
|
cxt
|
620cc83d4b
|
"从题库选用作业"暂时只提供公共作业和我的作业
|
2016-05-06 17:56:56 +08:00 |
|
cxt
|
10d26f89d9
|
作业列表的二级回复
|
2016-05-06 17:36:28 +08:00 |
|
huang
|
ae298f9b55
|
帖子详情页面添加编辑功能
|
2016-05-06 14:57:36 +08:00 |
|
huang
|
a5be092c16
|
二级目录帖子列表中添加编辑功能
|
2016-05-06 14:42:13 +08:00 |
|
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
2016-05-06 12:22:43 +08:00 |
|
huang
|
572a051b04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/users_controller.rb
app/views/blogs/_article.html.erb
app/views/layouts/new_base_user.html.erb
|
2016-05-06 11:35:27 +08:00 |
|
huang
|
aefcb78926
|
新base
|
2016-05-06 10:28:21 +08:00 |
|
huang
|
6e7d20c410
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-06 10:17:18 +08:00 |
|
huang
|
9e0176bc55
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/controllers/organizations_controller.rb
app/helpers/organizations_helper.rb
db/schema.rb
public/images/homepage_icon.png
public/stylesheets/new_user.css
|
2016-05-06 10:16:56 +08:00 |
|
huang
|
885b6f6092
|
隐藏掉“综合”选项，分页每页显示20个
|
2016-05-06 10:12:30 +08:00 |
|
cxt
|
0fafbffa49
|
项目的更新加到作业的最后更新时间中
|
2016-05-06 08:52:54 +08:00 |
|
huang
|
d0db711449
|
编辑功能
|
2016-05-05 18:47:32 +08:00 |
|
huang
|
02d6186045
|
二级域名讨论帖子添加删除链接
|
2016-05-05 16:43:20 +08:00 |
|
huang
|
e0c011948c
|
二级域名的隐藏和显示
|
2016-05-05 15:16:14 +08:00 |
|
yuanke
|
b82a1c1162
|
讨论区计算回复数的一个BUG
|
2016-05-05 14:52:58 +08:00 |
 guange
|
72f5f5b795
|
加入组织
|
2016-05-05 14:52:10 +08:00 |
|
huang
|
79cd36f297
|
二级域名排序
|
2016-05-05 14:39:27 +08:00 |
|
guange
|
17282083a6
|
merge
|
2016-05-05 14:07:37 +08:00 |
|
guange
|
88fd2cbfb6
|
Merge remote-tracking branch 'origin/develop' into guange_dev
|
2016-05-05 14:07:29 +08:00 |
|
guange
|
dfdd301f2f
|
sso同步登录功能完成
|
2016-05-05 14:06:47 +08:00 |
|
huang
|
6d28d0becd
|
二级域名的删除功能
|
2016-05-05 12:27:35 +08:00 |
|
huang
|
2920f21c95
|
二级域名编辑功能自动刷新
|
2016-05-05 11:28:28 +08:00 |
|
huang
|
d86fec6f03
|
模式6没有内容的显示
|
2016-05-04 19:30:01 +08:00 |