 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 |
 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 |
|
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 |
|
huang
|
ac95e1584c
|
问卷删除功能
|
2015-11-18 17:23:57 +08:00 |
|
ouyangxuhua
|
af981f841e
|
添加组织时，翻页提醒功能改善
|
2015-11-18 16:52:03 +08:00 |
|
cxt
|
d83e2e36ae
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-18 16:51:58 +08:00 |
|
cxt
|
d407610740
|
填空题
|
2015-11-18 16:51:47 +08:00 |
|
huang
|
cd2d947cb2
|
多项选择标准答案
|
2015-11-18 16:06:34 +08:00 |
|
ouyangxuhua
|
219774afab
|
将课程动态加入组织动态中
|
2015-11-18 16:05:08 +08:00 |
|
cxt
|
f850a71b59
|
测验
|
2015-11-18 15:30:39 +08:00 |
|
lizanle
|
47bae2dd79
|
去掉段落的字符之间的间距
|
2015-11-18 15:18:31 +08:00 |
|
lizanle
|
193471adf1
|
学生自己上传的资源应允许自己删除
|
2015-11-18 15:09:16 +08:00 |
|
huang
|
935b1f9f9e
|
大写小写问题
|
2015-11-18 14:50:03 +08:00 |
|
huang
|
de17ffa605
|
区分答案大小写
|
2015-11-18 14:31:35 +08:00 |
|
huang
|
3efae6bde2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-18 14:06:38 +08:00 |
|
huang
|
8965775004
|
show方法修改
|
2015-11-18 14:06:21 +08:00 |
|
cxt
|
0405d4eee6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-18 14:05:47 +08:00 |
|
cxt
|
249b15751d
|
新建多选题
|
2015-11-18 14:05:29 +08:00 |
|
huang
|
7f5fa7fb6f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/helpers/exercise_helper.rb
解决冲突
|
2015-11-18 14:03:17 +08:00 |
|
huang
|
25344ef0de
|
show方法
|
2015-11-18 14:01:55 +08:00 |
|
huang
|
deb0f151c4
|
单选数字转换
|
2015-11-18 13:55:42 +08:00 |