 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 |
|
cxt
|
265fe08b2c
|
在线测验
|
2015-11-18 10:49:57 +08:00 |
|
huang
|
282c7f5bd2
|
修改添加题目相关
|
2015-11-18 10:46:56 +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
|
b635fdaeb7
|
路由
|
2015-11-17 18:33:42 +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 |
|
huang
|
651f6565be
|
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 15:22:31 +08:00 |
|
huang
|
23ca20692f
|
问卷部分方法
|
2015-11-17 15:20:59 +08:00 |
|
cxt
|
034a92bb7b
|
新建测验页面
|
2015-11-17 15:18:07 +08:00 |
|
huang
|
0316bf698f
|
exercise新增、update
|
2015-11-17 11:25:17 +08:00 |
|
cxt
|
167d001b3f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-17 09:34:09 +08:00 |
|
cxt
|
5400b907e6
|
学生测验列表
|
2015-11-17 09:33:40 +08:00 |
 ouyangxuhua
|
d220dbbc9a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-16 15:45:18 +08:00 |
|
ouyangxuhua
|
10dedcb7be
|
增加组织成员加入时间
|
2015-11-16 15:39:59 +08:00 |
|
ouyangxuhua
|
de32745eef
|
1.将项目动态数据迁移至组织动态；
2.在组织动态中，按时间倒排显示组织动态；
3.增加我的组织中搜索功能。
|
2015-11-16 15:02:57 +08:00 |
|
cxt
|
10ac8eaa35
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-16 10:58:08 +08:00 |
|
cxt
|
c50bcf9331
|
对于提交已截止的作业，作业状态由“作品提交中”改为“作品补交中”
|
2015-11-16 10:56:00 +08:00 |
|
cxt
|
e22b4cbdeb
|
作业提交截止后，未提交作品的学生看到的作业动态将显示“补交作品”
|
2015-11-16 10:44:27 +08:00 |
|
cxt
|
62d80c27d6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-16 08:59:54 +08:00 |
|
cxt
|
24e9f5e7d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-11-16 08:53:15 +08:00 |
|
cxt
|
a50ec626cd
|
数据
|
2015-11-16 08:52:32 +08:00 |
|
ouyangxuhua
|
f5460d1126
|
组织动态添加项目动态
|
2015-11-14 15:19:49 +08:00 |
|
ouyangxuhua
|
c9a7a94767
|
组织动态添加项目动态
|
2015-11-14 15:15:54 +08:00 |
|
ouyangxuhua
|
1e1c210939
|
组织动态添加项目动态
|
2015-11-14 14:57:49 +08:00 |
|
ouyangxuhua
|
b7f12b9cde
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-14 14:32:02 +08:00 |
|
ouyangxuhua
|
38acb4230e
|
组织动态添加项目动态
|
2015-11-14 14:31:52 +08:00 |
 lizanle
|
0b2eedd3b4
|
成员的编辑权利错误
|
2015-11-14 11:26:07 +08:00 |
|
lizanle
|
79ba840b01
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-14 10:45:55 +08:00 |
|
lizanle
|
56613b6358
|
增加项目的显示
|
2015-11-14 10:45:49 +08:00 |
|
ouyangxuhua
|
9bf8f6058f
|
动态和文章样式问题解决
|
2015-11-14 10:25:51 +08:00 |
|
ouyangxuhua
|
c51491367f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-14 10:02:15 +08:00 |
|
ouyangxuhua
|
f313509d99
|
组织id的位置显示组织名称
|
2015-11-14 10:01:30 +08:00 |