 huang
|
550d056630
|
删除某个题目后顺序排列
|
2015-11-20 20:55:37 +08:00 |
|
huang
|
fc041d5e99
|
Merge branch 'szzh' into develop
|
2015-11-20 20:27:25 +08:00 |
|
huang
|
7478b8a449
|
Merge branch 'sw_new_course' into szzh
|
2015-11-20 20:26:47 +08:00 |
|
huang
|
dd148fb7c5
|
Merge branch 'szzh' into sw_new_course
Conflicts:
db/schema.rb
|
2015-11-20 20:25:17 +08:00 |
 cxt
|
b9460efa08
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 20:23:21 +08:00 |
|
cxt
|
cc19c345e1
|
提交
|
2015-11-20 20:23:02 +08:00 |
|
huang
|
2435f06f44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 20:03:11 +08:00 |
|
huang
|
8b29002a0f
|
修改得分规则
|
2015-11-20 20:02:57 +08:00 |
|
cxt
|
c36ec99ff6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 19:59:17 +08:00 |
|
cxt
|
9ca336a70a
|
发布和取消发布
|
2015-11-20 19:59:05 +08:00 |
 ouyangxuhua
|
5ac65d86b1
|
将org_document_comment中的title改成text类型
|
2015-11-20 19:58:25 +08:00 |
|
huang
|
c0dfc17b19
|
修改状态更新
|
2015-11-20 19:35:32 +08:00 |
|
huang
|
da55b00da7
|
删除插入问题
|
2015-11-20 19:05:39 +08:00 |
|
huang
|
a3122a9a2c
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 18:39:44 +08:00 |
|
huang
|
aa36c927d3
|
0
|
2015-11-20 18:39:35 +08:00 |
|
cxt
|
c07e2fe2d2
|
发布试卷
|
2015-11-20 18:38:50 +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 |
|
ouyangxuhua
|
6068867670
|
项目动态和组织动态删除后，删除相应的组织动态
|
2015-11-20 17:42:43 +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
|
d4d2adddb2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/exercise_controller.rb
|
2015-11-20 17:26:49 +08:00 |
|
cxt
|
eee63b2495
|
提交前验证数据不为空
|
2015-11-20 17:25:03 +08:00 |
|
huang
|
ed86e3ee5a
|
三种类型题目计算总分
|
2015-11-20 17:18:57 +08:00 |
|
ouyangxuhua
|
a57260aae6
|
修改当“Message”回复对应的组织动态
|
2015-11-20 16:41:15 +08:00 |
|
ouyangxuhua
|
5cfc8c2f8d
|
编辑文章后，或者回复文章后，更新组织动态的更新时间
|
2015-11-20 16:16:46 +08:00 |
|
huang
|
74f6cb2e64
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 15:14:07 +08:00 |
|
huang
|
db46e5e4af
|
问卷得分统计
|
2015-11-20 15:13:53 +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
|
9f6fc79df0
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 14:34:27 +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 |
|
huang
|
cb3f0d1c97
|
按类型分类，序号递增
|
2015-11-20 14:28:47 +08:00 |
|
huang
|
07ee819370
|
学生多选答题
|
2015-11-20 13:39:40 +08:00 |
|
huang
|
302dfaf933
|
新建万卷初始showresult
|
2015-11-20 13:04:51 +08:00 |
|
huang
|
469e71e77d
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 12:55:30 +08:00 |
|
huang
|
13af6e64b2
|
修改允许学生查看参数
|
2015-11-20 12:55:23 +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 |
|
huang
|
e9998edbc2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 11:08:55 +08:00 |
|
cxt
|
4204521e14
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 11:09:02 +08:00 |