 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 |
|
cxt
|
acaac93da1
|
tijiao
|
2015-11-20 11:08:50 +08:00 |
|
huang
|
3deebf2006
|
show
|
2015-11-20 11:08:47 +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 |
|
huang
|
21694daa59
|
多选顺序按小到大排序
|
2015-11-20 10:05:34 +08:00 |
|
cxt
|
d583ca1d70
|
样式调整
|
2015-11-20 09:54:46 +08:00 |
|
huang
|
e172952b2a
|
Merge branch 'szzh' into develop
|
2015-11-20 09:30:03 +08:00 |
|
ouyangxuhua
|
4d4b163f17
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-20 09:27:15 +08:00 |
|
ouyangxuhua
|
d71d9730bd
|
修改迁移文件的bug
|
2015-11-20 09:26:58 +08:00 |
|
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 |