 huang
|
0a18f365ab
|
新的迁移
|
2016-03-05 08:00:56 +08:00 |
|
huang
|
a079a61c82
|
回复数
|
2016-03-05 04:29:10 +08:00 |
|
huang
|
0d1c9f90ab
|
Merge branch 'hjq_new_course' into develop
|
2016-03-05 04:22:46 +08:00 |
|
huang
|
094af07a2f
|
数据迁移
|
2016-03-05 04:22:01 +08:00 |
|
huang
|
d54609075b
|
区分新闻和新闻回复得分
|
2016-03-05 04:01:10 +08:00 |
|
huang
|
6ceb4f4549
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/models/course_contributor_score.rb
app/views/organizations/_org_course_homework.html.erb
app/views/users/_homework_search_input.html.erb
app/views/users/_show_user_homeworks.html.erb
app/views/users/_user_homework_detail.html.erb
app/views/users/_user_homework_form.html.erb
app/views/users/user_homework_type.js.erb
app/views/users/user_homeworks.html.erb
app/views/users/user_homeworks.js.erb
|
2016-03-05 03:17:47 +08:00 |
|
huang
|
bafa151c0d
|
0
|
2016-03-05 03:16:04 +08:00 |
|
huang
|
3f56fa3405
|
0
|
2016-03-05 03:14:57 +08:00 |
|
huang
|
f381784a3c
|
数据迁移
|
2016-03-05 03:13:58 +08:00 |
|
huang
|
814e766577
|
课程过滤
|
2016-03-04 21:22:47 +08:00 |
|
huang
|
e4d669251f
|
英雄榜得分
|
2016-03-04 21:13:24 +08:00 |
|
huang
|
4cf80fe441
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-04 21:11:07 +08:00 |
|
huang
|
6ce947667d
|
课程英雄榜提示
|
2016-03-04 21:10:45 +08:00 |
 cxt
|
782bbc775b
|
公共资源库的统计
|
2016-03-04 21:04:21 +08:00 |
|
huang
|
de1c2e18c8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-04 18:37:46 +08:00 |
|
huang
|
fdaaaf9d20
|
Merge branch 'hjq_new_course' into develop
|
2016-03-04 18:37:23 +08:00 |
|
huang
|
38fca02193
|
注释搜索
|
2016-03-04 18:36:42 +08:00 |
|
cxt
|
4289c3a107
|
Merge branch 'szzh' into develop
|
2016-03-04 18:23:52 +08:00 |
|
cxt
|
0f063b9541
|
Merge branch 'cxt_course' into szzh
|
2016-03-04 18:22:55 +08:00 |
|
huang
|
ae40a4ea61
|
公共资源相关功能
|
2016-03-04 18:22:22 +08:00 |
|
cxt
|
3deaa492b2
|
编辑作业时作业描述被解析了
|
2016-03-04 18:11:23 +08:00 |
|
cxt
|
4f3055c990
|
讨论区改为问答区，且放开课程的“问答区”，就是课外的用户也能在公开课内发帖或回帖。
|
2016-03-04 17:11:52 +08:00 |
|
cxt
|
fd8b40a36e
|
对于编程作业，系统评分的前几名能否也显示出来
|
2016-03-04 16:53:36 +08:00 |
|
huang
|
91b8a81b9d
|
去掉全站搜索
|
2016-03-04 16:10:41 +08:00 |
|
huang
|
bbbf13084e
|
修改搜索功能，页面跳转
|
2016-03-04 16:05:58 +08:00 |
|
cxt
|
947e6ea469
|
作业--“禁用匿评”处增加提示语：匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品。
|
2016-03-04 16:00:20 +08:00 |
|
cxt
|
ffac8164f1
|
管理员的课程和项目列表，按照时间倒排
|
2016-03-04 15:55:45 +08:00 |
|
cxt
|
a5cb3d5e6a
|
新建作品时的输入框改为“请输入作品名称”、“请输入作品描述”
|
2016-03-04 15:14:38 +08:00 |
|
cxt
|
d2920c64ea
|
题库作业发送到课程后增加提示
|
2016-03-04 15:12:03 +08:00 |
|
cxt
|
6416b01037
|
课程里的“课程作业”改为“作业”
|
2016-03-04 14:28:06 +08:00 |
|
huang
|
dfddb30ca3
|
附件引用
|
2016-03-04 14:21:39 +08:00 |
|
cxt
|
6c34045c59
|
Merge branch 'develop' into cxt_course
|
2016-03-04 13:20:26 +08:00 |
|
cxt
|
6ca702eb2c
|
题库发送的课程列表中不包含当前作业所在的课程
|
2016-03-04 13:18:43 +08:00 |
|
cxt
|
8aff404f0c
|
题库过滤作业的搜索
|
2016-03-04 11:37:14 +08:00 |
|
huang
|
9beaa62d6d
|
课程活跃度
|
2016-03-04 11:36:34 +08:00 |
|
huang
|
50011985a9
|
课程资源库添加资源描述
|
2016-03-04 11:19:07 +08:00 |
|
cxt
|
b333c40ce0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/public.css
|
2016-03-04 11:11:25 +08:00 |
|
cxt
|
bac94058de
|
Merge branch 'szzh' into develop
|
2016-03-04 11:09:55 +08:00 |
|
cxt
|
3ab111b322
|
Merge branch 'cxt_course' into szzh
|
2016-03-04 11:09:15 +08:00 |
|
cxt
|
e2ff348075
|
题库的作业过滤
|
2016-03-04 11:07:53 +08:00 |
|
cxt
|
0cd536fcc9
|
题库增加发布者姓名搜索
|
2016-03-04 10:34:04 +08:00 |
|
huang
|
8eb7551ec3
|
Merge branch 'develop' into hjq_new_course
|
2016-03-04 10:08:18 +08:00 |
|
huang
|
596d4e17e9
|
解决样式冲突
|
2016-03-04 09:57:54 +08:00 |
|
huang
|
97e6299a2b
|
Merge branch 'hjq_new_course' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
2016-03-04 09:33:38 +08:00 |
|
huang
|
95346bb419
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
public/stylesheets/public.css
|
2016-03-04 09:32:49 +08:00 |
|
huang
|
5ab9e3b5b7
|
资源搜索
作业留言
|
2016-03-04 09:29:20 +08:00 |
|
cxt
|
2f17645271
|
Merge branch 'szzh' into develop
|
2016-03-04 09:25:43 +08:00 |
|
cxt
|
c0ed149719
|
Merge branch 'cxt_course' into szzh
|
2016-03-04 09:20:50 +08:00 |
|
huang
|
e9c9112b38
|
公共资源封装
|
2016-03-04 00:41:41 +08:00 |
|
huang
|
ba9b22fbe1
|
公共资源，删除、重命名
|
2016-03-03 23:56:06 +08:00 |