 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
|
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
|
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
|
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
|
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
|
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
|
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 |
|
cxt
|
c5c16e25b6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-18 11:14:34 +08:00 |
|
ouyangxuhua
|
b231b44e81
|
1.项目和课程中，添加翻页提醒；
2.项目和课程中，删除组织关联时，给出弹窗，确认是否删除。
|
2015-11-18 11:12:40 +08:00 |
|
ouyangxuhua
|
fc7e41ebf9
|
1.在项目和课程在关联和删除关联组织后，翻页能链接到正确的位置
|
2015-11-18 10:57:17 +08:00 |
|
lizanle
|
60fda5e391
|
火狐MathJax显示公式错误，还是不能不用图形字体
|
2015-11-18 10:55:55 +08:00 |
|
cxt
|
265fe08b2c
|
在线测验
|
2015-11-18 10:49:57 +08:00 |
|
huang
|
282c7f5bd2
|
修改添加题目相关
|
2015-11-18 10:46:56 +08:00 |
|
lizanle
|
d133acbf2a
|
论坛帖子显示更新时间
|
2015-11-18 10:41:54 +08:00 |
|
lizanle
|
6a59e39ef1
|
允许学生上传资源
|
2015-11-18 10:18:54 +08:00 |
|
lizanle
|
8e55c98ccf
|
MathJax不允许使用图片资源，不然图片太多了。有30000个左右
|
2015-11-18 09:57:03 +08:00 |
|
huang
|
02db1b7e14
|
问卷添加标准答案
|
2015-11-17 21:13:17 +08:00 |
|
huang
|
9cf5a92a44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-17 20:24:44 +08:00 |
|
huang
|
221a73309f
|
index页面删掉无效的测试
|
2015-11-17 20:23:39 +08:00 |
|
cxt
|
452cf1c854
|
测验
|
2015-11-17 20:23:14 +08:00 |
|
cxt
|
2c9c87c3c6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/exercise_controller.rb
|
2015-11-17 19:52:41 +08:00 |
|
cxt
|
bb99a11c37
|
页面修改
|
2015-11-17 19:49:33 +08:00 |
|
huang
|
d61ec92318
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-17 19:48:08 +08:00 |
|
huang
|
f316f43d6d
|
修改edit界面无法找到的问题
|
2015-11-17 19:47:48 +08:00 |
|
cxt
|
7472d959f3
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-17 19:33:27 +08:00 |
|
cxt
|
631418a012
|
单选题
|
2015-11-17 19:33:14 +08:00 |
|
huang
|
3cdda2a60a
|
修改创建方式
|
2015-11-17 19:29:25 +08:00 |
|
huang
|
9935cfea44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-17 18:34:15 +08:00 |
|
huang
|
99f4483a16
|
删除问卷（未完）
|
2015-11-17 18:34:01 +08:00 |
|
cxt
|
f68ffc99ec
|
保存单选题
|
2015-11-17 18:26:39 +08:00 |
|
cxt
|
b3e6bf40ff
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-17 18:23:07 +08:00 |
|
cxt
|
cc08e5e32e
|
保存测验信息
|
2015-11-17 18:22:31 +08:00 |
|
huang
|
4a0865ab76
|
添加和编辑题目
|
2015-11-17 18:20:47 +08:00 |
|
ouyangxuhua
|
71bf80c7a5
|
1.创建组织课程关联表，建立相应模型及控制器；
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
|
2015-11-17 17:34:50 +08:00 |
|
lizanle
|
291868ba43
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
|
2015-11-17 16:48:03 +08:00 |