Commit Graph

6853 Commits

Author SHA1 Message Date
cxt acaac93da1 tijiao 2015-11-20 11:08:50 +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
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
cxt a173e924d0 插入题目 2015-11-19 09:13:46 +08:00
cxt 368fc339c0 样式调整 2015-11-18 20:14:19 +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
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
cxt d407610740 填空题 2015-11-18 16:51:47 +08:00
cxt f850a71b59 测验 2015-11-18 15:30:39 +08:00
cxt 249b15751d 新建多选题 2015-11-18 14:05:29 +08:00
cxt 265fe08b2c 在线测验 2015-11-18 10:49:57 +08:00
cxt 452cf1c854 测验 2015-11-17 20:23:14 +08:00
cxt bb99a11c37 页面修改 2015-11-17 19:49:33 +08:00
cxt 631418a012 单选题 2015-11-17 19:33:14 +08:00
cxt f68ffc99ec 保存单选题 2015-11-17 18:26:39 +08:00
cxt cc08e5e32e 保存测验信息 2015-11-17 18:22:31 +08:00
cxt 034a92bb7b 新建测验页面 2015-11-17 15:18:07 +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 62d80c27d6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-16 08:59: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
lizanle e1a88dedbb 首页回复 会变成组织 2015-11-14 09:58:53 +08:00
lizanle 1edaed8bf1 Merge remote-tracking branch 'origin/szzh' into szzh 2015-11-14 09:45:00 +08:00
lizanle b88d5e59a1 回复的时候会多出一条一模一样的内容 2015-11-14 09:44:53 +08:00