 huang
|
08c7eb8d40
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-19 21:21:26 +08:00 |
|
huang
|
81e2827277
|
解决参数为空的bug
|
2015-11-19 21:21:02 +08:00 |
 cxt
|
20f7560b07
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-19 21:19:30 +08:00 |
|
cxt
|
9aee23507c
|
学生答题页面、答题结果页面、老师的试卷页面
|
2015-11-19 21:19:18 +08:00 |
|
huang
|
7dc16775dc
|
添加字段迁移
|
2015-11-19 20:44:01 +08:00 |
|
huang
|
b71e6a9b9a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-19 20:38:24 +08:00 |
|
huang
|
20a80fe6eb
|
修改JS
|
2015-11-19 20:38:03 +08:00 |
|
huang
|
74343a4929
|
发布问卷、取消问卷
|
2015-11-19 20:35:08 +08:00 |
|
cxt
|
602373812f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-19 17:50:32 +08:00 |
|
cxt
|
d91a6c03b1
|
编辑
|
2015-11-19 17:50:24 +08:00 |
|
huang
|
87e7a51278
|
删除
|
2015-11-19 17:36:58 +08:00 |
|
huang
|
7ab0f4764a
|
主管题插入删除更新
|
2015-11-19 17:31:26 +08:00 |
|
cxt
|
27c88fda4f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/views/exercise/_edit_single.html.erb
|
2015-11-19 17:20:25 +08:00 |
|
cxt
|
2c1b03079b
|
学生测验界面
|
2015-11-19 17:18:58 +08:00 |
|
huang
|
02f6b636cd
|
完成更新功能
|
2015-11-19 17:09:59 +08:00 |
|
huang
|
f3614999da
|
gi
|
2015-11-19 16:38:46 +08:00 |
|
huang
|
7d1b8dfe42
|
Merge branch 'szzh' into develop
|
2015-11-19 16:25:50 +08:00 |
|
huang
|
348488383c
|
Merge branch 'develop' into szzh
Conflicts:
app/views/projects/settings/_join_org.html.erb
|
2015-11-19 16:24:56 +08:00 |
|
huang
|
841ebb7846
|
简单题更新，未完
|
2015-11-19 16:21:31 +08:00 |
 lizanle
|
34a2c2c90d
|
课程创建属性添加 是否允许学生上传资源
|
2015-11-19 15:13:34 +08:00 |
|
lizanle
|
dffabce806
|
Merge branch 'dev_zanle' into szzh
Conflicts:
db/schema.rb
|
2015-11-19 15:03:56 +08:00 |
|
lizanle
|
56e96a035b
|
schema.rb
|
2015-11-19 15:01:03 +08:00 |
 houxiang
|
fdedcbfa81
|
增加了注释
|
2015-11-19 14:59:26 +08:00 |
 Gan Yi.ang
|
f6bfd7824d
|
优化查看commits那个页面
|
2015-11-19 14:42:37 +08:00 |
|
cxt
|
cf4717278f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-19 14:36:45 +08:00 |
|
cxt
|
5e5c18725d
|
用户在新建题目时必须先保存其他正在编辑的题
|
2015-11-19 14:35:51 +08:00 |
|
huang
|
a900c70e76
|
试题更新
|
2015-11-19 14:26:51 +08:00 |
|
huang
|
d7020fad1f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-19 13:07:00 +08:00 |
|
cxt
|
3929aa6dde
|
编辑
|
2015-11-19 13:06:17 +08:00 |
|
huang
|
4c71d8a85e
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-19 11:39:04 +08:00 |
|
huang
|
bc47382115
|
用户提交答卷后，给出得分
|
2015-11-19 11:38:44 +08:00 |
|
cxt
|
4cd9f6a502
|
新建题目时分数自动获取同一类型题目的最后一个分数
|
2015-11-19 11:37:49 +08:00 |
 ouyangxuhua
|
0c891236a8
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/projects/settings/_join_org.html.erb
|
2015-11-19 10:44:30 +08:00 |
|
ouyangxuhua
|
b5ffdde1fe
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/projects/settings/_join_org.html.erb
|
2015-11-19 10:25:54 +08:00 |
|
ouyangxuhua
|
09659387e7
|
文章动态中，将组织改成组织文章
|
2015-11-19 10:15:33 +08:00 |
|
ouyangxuhua
|
478a534c96
|
1.将课程动态加入组织动态的过滤条件中；
2.创建文章成功后，给出信息提醒
|
2015-11-19 10:08:11 +08:00 |
|
Gan Yi.ang
|
ea47a8085a
|
修复新建版本库无响应
|
2015-11-19 09:20:25 +08:00 |
|
cxt
|
c7476b3f86
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-19 09:13:56 +08:00 |
|
cxt
|
a173e924d0
|
插入题目
|
2015-11-19 09:13:46 +08:00 |
|
huang
|
037d998f23
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-18 21:16:43 +08:00 |
|
huang
|
2296a2f50c
|
添加学生提交作业
老师发布作业功能
|
2015-11-18 21:16:24 +08:00 |
|
cxt
|
398a7da533
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-18 20:14:30 +08:00 |
|
cxt
|
368fc339c0
|
样式调整
|
2015-11-18 20:14:19 +08:00 |
|
huang
|
8cf22767f9
|
新建问答题
|
2015-11-18 19:58:00 +08:00 |
|
huang
|
8e4b2bd7d4
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-18 18:28:37 +08:00 |
|
huang
|
1606e9ddab
|
0
|
2015-11-18 18:28:17 +08:00 |
|
cxt
|
28f7390595
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-18 17:56:41 +08:00 |
|
cxt
|
3d3d50f1ea
|
编辑
|
2015-11-18 17:56:01 +08:00 |
|
ouyangxuhua
|
8e359c3d94
|
隐藏我的组织的搜索功能
|
2015-11-18 17:27:29 +08:00 |
|
huang
|
1d5ae6d561
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-18 17:24:18 +08:00 |