 cxt
|
e89cb99743
|
添加学生测验结果页面的批次链接
|
2015-11-24 16:20:29 +08:00 |
 huang
|
83c7e981af
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 21:50:35 +08:00 |
|
cxt
|
dbe236032b
|
新建题目时必须先保存标题
|
2015-11-20 21:50:27 +08:00 |
|
huang
|
3083f683b9
|
修改删除的时候顺序乱的问题
添加相应的参数
|
2015-11-20 21:14:09 +08:00 |
|
cxt
|
89f8f5f383
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 20:44:40 +08:00 |
|
cxt
|
b10fbcde8c
|
取消发布和发布测验
|
2015-11-20 20:44:27 +08:00 |
|
huang
|
dd148fb7c5
|
Merge branch 'szzh' into sw_new_course
Conflicts:
db/schema.rb
|
2015-11-20 20:25:17 +08:00 |
|
cxt
|
cc19c345e1
|
提交
|
2015-11-20 20:23:02 +08:00 |
|
cxt
|
9ca336a70a
|
发布和取消发布
|
2015-11-20 19:59:05 +08:00 |
|
cxt
|
98297da226
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 18:29:36 +08:00 |
|
cxt
|
c9ba57f64b
|
去掉关闭、导入等功能
|
2015-11-20 18:29:26 +08:00 |
|
huang
|
bb726e3475
|
提交答案验证
|
2015-11-20 18:21:31 +08:00 |
|
huang
|
d1e0e0fd30
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 18:02:04 +08:00 |
|
huang
|
97485ca221
|
修改show逻辑
提交问卷后学生页面显示
|
2015-11-20 18:01:50 +08:00 |
|
cxt
|
da34083a2a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 18:00:22 +08:00 |
|
cxt
|
332ace0f34
|
列表
|
2015-11-20 18:00:11 +08:00 |
|
huang
|
431d1d886c
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 17:29:33 +08:00 |
|
huang
|
8728557813
|
老师和学生统计数目区分
|
2015-11-20 17:29:15 +08:00 |
|
cxt
|
eee63b2495
|
提交前验证数据不为空
|
2015-11-20 17:25:03 +08:00 |
|
huang
|
ed86e3ee5a
|
三种类型题目计算总分
|
2015-11-20 17:18:57 +08:00 |
|
cxt
|
b0730dfb81
|
测验
|
2015-11-20 15:12:07 +08:00 |
 ouyangxuhua
|
d77d4a421b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-20 14:51:16 +08:00 |
|
ouyangxuhua
|
dcbdea9bb5
|
1.修复文章详细列表删除后，页面报错的问题；
2.文章详情页面中，文章回复显示中回复人丢失问题修复
|
2015-11-20 14:50:48 +08:00 |
|
cxt
|
863d7ed4b5
|
单选和填空
|
2015-11-20 14:34:09 +08:00 |
 Tim
|
1aa7599771
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-20 14:31:10 +08:00 |
|
Tim
|
e3d78bf4f0
|
组织样式更改
|
2015-11-20 14:30:54 +08:00 |
|
cxt
|
99945d5bb5
|
学生答题界面的修改
|
2015-11-20 12:54:41 +08:00 |
|
ouyangxuhua
|
e01a7c2627
|
Merge branch 'szzh' into dev_hjq
|
2015-11-20 11:14:11 +08:00 |
|
ouyangxuhua
|
b10ff36c51
|
1.组织文章和成员访问权限控制；
2.修改编辑文章不能提交的问题。
|
2015-11-20 11:12:45 +08:00 |
|
cxt
|
acaac93da1
|
tijiao
|
2015-11-20 11:08:50 +08:00 |
|
ouyangxuhua
|
faa99a5df4
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-11-20 10:52:43 +08:00 |
|
ouyangxuhua
|
40a44c3568
|
增加文章二级回复功能
|
2015-11-20 10:52:26 +08:00 |
|
cxt
|
d583ca1d70
|
样式调整
|
2015-11-20 09:54:46 +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
|
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
|
d91a6c03b1
|
编辑
|
2015-11-19 17:50:24 +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
|
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 |
|
cxt
|
5e5c18725d
|
用户在新建题目时必须先保存其他正在编辑的题
|
2015-11-19 14:35:51 +08:00 |
|
cxt
|
3929aa6dde
|
编辑
|
2015-11-19 13:06:17 +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
|
09659387e7
|
文章动态中，将组织改成组织文章
|
2015-11-19 10:15:33 +08:00 |
|
ouyangxuhua
|
478a534c96
|
1.将课程动态加入组织动态的过滤条件中；
2.创建文章成功后，给出信息提醒
|
2015-11-19 10:08:11 +08:00 |