jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
11,550 Commits 98 Branches 0 Tags 0 B
Commit Graph

7291 Commits

Author SHA1 Message Date
cxt bb2f49439e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2015-12-11 15:00:35 +08:00
cxt 27ed6df9d6 Merge branch 'szzh' into develop 2015-12-11 14:59:52 +08:00
cxt a3715051b1 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 14:59:13 +08:00
cxt f880ccd749 分组作业 2015-12-11 14:57:09 +08:00
lizanle ec79ed04ee Merge branch 'szzh' into dev_zanle 2015-12-11 14:47:32 +08:00
lizanle b6607f7418 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 14:46:48 +08:00
huang f2b8335912 移出成员时，删除项目后没有关联删除而引起的400问题 2015-12-11 13:48:52 +08:00
huang fed989753a 修复林处账号不能查看消息的问题 2015-12-11 13:46:23 +08:00
huang 75fecc0402 项目删除功能 
项目删除权限
课程列表用户颜色
 2015-12-11 12:53:01 +08:00
huang 9c472b9358 课程成员列表乱的问题 2015-12-11 11:23:02 +08:00
huang 35c918cb40 Merge branch 'hjq_new_course' into develop 2015-12-11 11:02:09 +08:00
huang fbd1b2f541 用户留言重复提交问题 2015-12-11 10:53:14 +08:00
huang 01b21ceda1 项目留言重复提交问题 2015-12-11 09:52:17 +08:00
huang 1ba0dae3c4 修复课程留言重复提交问题 2015-12-11 09:42:19 +08:00
huang 670df76c70 注释掉项目邀请加入功能 2015-12-10 20:24:42 +08:00
huang 9710731a2c 课程配置添加登录名 2015-12-10 20:03:59 +08:00
huang c7b2c9e3af 课程删除功能 
admin中课程列表取消删除按钮
 2015-12-10 18:59:54 +08:00
huang a9510f4869 Merge branch 'dev_hjq' into develop 2015-12-10 17:29:52 +08:00
huang 4f7f4acb1f 课程删除 2015-12-10 17:26:03 +08:00
ouyangxuhua aab9594ac9 1.解决英文版下，组织成员列表编辑成员显示错误； 
2.解决在组织文章详情页面，删除文章报错的问题
 2015-12-10 17:22:59 +08:00
huang be940ee3aa Merge branch 'develop' into hjq_new_course 2015-12-10 16:09:36 +08:00
huang dbadbf8621 修改密码gitlab同步 2015-12-10 15:54:44 +08:00
ouyangxuhua 0a85fbf613 1.配置栏目列表，增加类型一列； 
2.暂时隐藏类型为“资源”的栏目的链接
 2015-12-10 15:53:05 +08:00
ouyangxuhua 1e652faec7 Merge branch 'develop' into dev_hjq 2015-12-10 10:55:59 +08:00
ouyangxuhua 2f7260cba2 1.在栏目表中增加field_type(类型)字段； 
2.在组织配置-》栏目，增加栏目类型。
 2015-12-09 17:24:59 +08:00
cxt 4e04df7a8a 分组作业的动态显示及关联项目 2015-12-09 16:33:48 +08:00
ouyangxuhua 78fb8b6254 1.编辑或者删除栏目的帖子返回对应页面 2015-12-09 16:19:52 +08:00
cxt f2f81d5243 作品列表的代码缩进 2015-12-09 10:52:56 +08:00
ouyangxuhua 333c0e41a0 1.栏目增加新建帖子功能； 
2.点击某栏目，显示相应的动态；
3.编辑栏目里的文章后，返回相应的栏目动态。
 2015-12-09 10:48:15 +08:00
cxt 53f9141cf1 分组作业动态 2015-12-09 10:29:54 +08:00
lizanle 6c02115f3f 不允许修改登录名 2015-12-09 10:17:30 +08:00
guange 3476731b83 将at js data整合到文件中 2015-12-09 09:59:13 +08:00
lizanle c1d82d6348 输入框 和 ke对齐 2015-12-09 09:39:07 +08:00
ouyangxuhua 09f0d0201e 组织增加栏目发帖功能 2015-12-09 09:23:22 +08:00
cxt a9f6e817b4 分组作业关联项目 2015-12-08 17:37:15 +08:00
cxt c26778b41c 分组作业关联项目 2015-12-08 17:36:35 +08:00
huang ac9f13c842 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 
Conflicts:
	app/views/repositories/show.html.erb
	db/schema.rb

处理冲突
 2015-12-08 17:13:50 +08:00
huang 916d99be82 课程删除功能 2015-12-08 16:45:26 +08:00
houxiang 56cb83ffba 版本库首页没有统计commit_count，具体的详情页在开始统计 2015-12-08 15:56:31 +08:00
lizanle 92bc3361fe 匿评失败消息改变 2015-12-08 15:33:17 +08:00
ouyangxuhua 1881e18742 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-08 15:31:17 +08:00
ouyangxuhua bb7bcf46a9 1.设置首页后，跳转至组织首页 2015-12-08 15:30:58 +08:00
huang 7c34122ff6 fork的时候如果用户没有同步，则自动同步 2015-12-08 09:46:29 +08:00
huang 068c305c06 Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course 
Conflicts:
	app/views/courses/member.html.erb
	app/views/courses/settings.html.erb
	app/views/repositories/show.html.erb
	db/schema.rb

处理冲突
 2015-12-08 09:10:21 +08:00
lizanle 5fcbde2ff1 资源库监听回车键 2015-12-07 17:29:14 +08:00
ouyangxuhua 8b14e7c549 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-07 17:19:52 +08:00
ouyangxuhua 5198f4dde4 Merge branch 'dev_hjq' into develop 2015-12-07 17:19:26 +08:00
ouyangxuhua 9d6b4783df 删除组织配置栏目的组织首页项 2015-12-07 17:18:46 +08:00
huang 91fa3f6fab 解决项目样式冲突问题 2015-12-07 16:52:23 +08:00
lizanle ee661bb6d4 input光光标到最后的折中解决方案 2015-12-07 16:21:00 +08:00
ouyangxuhua e45ce0fb95 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-07 15:52:32 +08:00
lizanle 9e01f02a66 作业题目统一改为作业标题 
作业匿评截止消息改造
 2015-12-07 15:52:22 +08:00
ouyangxuhua 76db95aa03 1.组织页面中，退出后刷新组织页面； 
2.组织页面中，点击“个人主页”，打开新的页面；
3.组织页面页首部分，用户名不链接用户页面。
 2015-12-07 15:52:13 +08:00
lizanle ad2d9fa374 添加对帖子的全文搜索 2015-12-07 15:32:57 +08:00
cxt cb7ad682cf Merge branch 'develop' into cxt_course 2015-12-07 15:21:43 +08:00
cxt c8f4149206 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-07 15:18:43 +08:00
cxt 8e999ed9f0 作业动态的回复删除功能只在鼠标进入时显示 2015-12-07 15:18:32 +08:00
huang 5eb249515c 版本库显示样式 2015-12-07 15:12:30 +08:00
guange 57d05d147e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-12-07 15:06:15 +08:00
huang 9ff41c214b Merge branch 'develop' into dev_hjq 2015-12-07 14:40:25 +08:00
ouyangxuhua 9f30c7a44e 如果用户没有登陆，不能在组织页面中，增加项目或课程。 2015-12-07 14:37:35 +08:00
ouyangxuhua 7057a4cfea 组织页首增加退出功能 2015-12-07 14:31:08 +08:00
lizanle ef2ef7111c 添加对帖子的全文搜索 2015-12-07 14:31:05 +08:00
guange 0c7db76371 tag没闭合的错误 2015-12-07 13:54:52 +08:00
ouyangxuhua c229104d78 修改编辑组织标题 2015-12-07 13:03:21 +08:00
ouyangxuhua 5034ddb4b6 修复组织的bug 2015-12-07 12:53:51 +08:00
cxt 73e9a00a1a 作业动态添加回复的删除功能 2015-12-07 11:25:41 +08:00
cxt 0472a5ed0c Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-07 10:54:28 +08:00
cxt a62ecc10ad 作业动态设置评分后无法刷新 2015-12-07 10:54:18 +08:00
huang ab1c945a30 修改版本库库权限 
自己不能fork自己的项目
 2015-12-07 10:34:10 +08:00
Tim 75d79c6c47 问题跟踪样式调整 2015-12-07 10:14:39 +08:00
cxt b61a0a98e5 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/student_work/new.html.erb
	app/views/users/_user_homework_form.html.erb
	db/schema.rb
	public/stylesheets/courses.css
 2015-12-07 09:47:18 +08:00
guange 3d2ac4b59f KE引用统一使用import_ke 2015-12-06 15:03:36 +08:00
guange af31946586 issue列表开启AT功能 2015-12-06 15:03:12 +08:00
huang bd3d0547f5 组织样式修改 2015-12-05 14:34:16 +08:00
ouyangxuhua 4c9d9dee35 组织首页样式 2015-12-05 13:27:58 +08:00
ouyangxuhua 108865968b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-05 12:01:49 +08:00
ouyangxuhua 12c57e7e4b 将Jquery引入组织首页 2015-12-05 12:01:04 +08:00
huang 9d68fd7d28 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-05 11:39:50 +08:00
huang 9d7bc17115 Merge branch 'develop' into dev_hjq 2015-12-05 11:39:40 +08:00
ouyangxuhua 37a7abea53 组织首页 2015-12-05 11:31:20 +08:00
ouyangxuhua 01b82e59d8 实现组织首页功能 2015-12-05 11:30:05 +08:00
ouyangxuhua 5b0bdb5069 修改组织栏目的内容及样式 2015-12-04 18:19:35 +08:00
huang c7058e6bbf Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-04 17:45:18 +08:00
huang 4cb58211ad 邮件消息提示语修改 2015-12-04 17:44:46 +08:00
ouyangxuhua ab4d0e4678 组织界面增加分栏 2015-12-04 17:34:48 +08:00
huang 6fad26cabf 去死奥placebold 2015-12-04 17:32:56 +08:00
cxt 8b160b1c38 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-04 17:29:55 +08:00
cxt 19c34de643 编辑作品时弹出的作品确认框不提供重试的按钮 2015-12-04 17:29:39 +08:00
huang 120a7274d3 fork样式显示 2015-12-04 17:22:22 +08:00
huang c72cf55564 Merge branch 'develop' into szzh 2015-12-04 16:43:48 +08:00
huang 61d76e6744 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-04 16:42:55 +08:00
lizanle 4c00312f45 Merge branch 'szzh' into dev_zanle 2015-12-04 16:42:02 +08:00
huang 9716e99533 课程成员提交“修改角色” 2015-12-04 16:33:56 +08:00
huang 7daaa59010 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 2015-12-04 16:22:02 +08:00
huang b6edabed9c 修改角色 2015-12-04 16:21:48 +08:00
cxt 8fe53468e1 作品追加附件 2015-12-04 16:21:11 +08:00
Tim dfa9b4cf74 学生列表调整 2015-12-04 16:13:55 +08:00
huang 4a41039fa6 课程英雄榜改成课程活跃度 2015-12-04 15:58:56 +08:00
huang 4d0956dff1 Merge branch 'develop' into gitlab_guange 2015-12-04 15:54:56 +08:00
huang 9f73807e05 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 
Conflicts:
	db/schema.rb
处理冲突
 2015-12-04 15:54:18 +08:00
huang c1747ab217 fork重名，提交 2015-12-04 15:49:05 +08:00
lizanle dbfc4969e0 测验消息bug 2015-12-04 15:36:19 +08:00
lizanle e3c594a7ca Merge branch 'develop' into dev_zanle 2015-12-04 10:59:14 +08:00
ouyangxuhua 2855c0e409 修改项目动态，使其与课程动态及个人动态的样式一致，包括有回复框、过滤菜单、宽度、间距等 2015-12-04 10:59:09 +08:00
lizanle 6553559929 发送消息 2015-12-04 10:56:16 +08:00
huang 8f024bdf4d Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 
Conflicts:
	db/schema.rb
 2015-12-04 09:12:24 +08:00
huang 7fe3a02d81 Merge branch 'gitlab_guange' into develop 2015-12-04 09:11:22 +08:00
huang 89b8f7783d 添加forked_form的id 2015-12-04 08:57:29 +08:00
huang 5d18b14e73 Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course 2015-12-04 00:16:21 +08:00
huang 057d9a3337 0 2015-12-04 00:15:47 +08:00
huang 8d891a9faa fork权限 2015-12-03 20:57:09 +08:00
huang b91c65798d 课程成员添加设置 2015-12-03 20:44:29 +08:00
cxt 4e9e7543ba chrome浏览器点击保存测验头部信息无反应 2015-12-03 19:21:35 +08:00
cxt fd51b02e16 添加修订附件 2015-12-03 18:33:08 +08:00
cxt 77e96af78f 还原分组作业 2015-12-03 10:41:27 +08:00
cxt 9c4c90e066 Merge branch 'develop' into cxt_course 2015-12-03 09:55:18 +08:00
cxt f90ff781ab 学生提交作品页面的合作成员弹窗 2015-12-03 09:17:36 +08:00
ouyangxuhua 9baeb850a3 在管理员界面中，添加组织的编辑和删除功能。 2015-12-02 17:34:21 +08:00
ouyangxuhua 95b071a8f7 修复组织模块的bug 2015-12-02 16:48:49 +08:00
lizanle adb246f9ad 注释标记 错误 
<!-- -->
 2015-12-02 15:30:07 +08:00
lizanle 9fe5cfbf76 资源发送课程发送项目自动搜索 2015-12-02 14:38:41 +08:00
lizanle 2f0895c2c2 发送资源成功给出提示 
发送资源默认为发送课程
 2015-12-02 13:40:53 +08:00
cxt ae218fa86c 发布作业时添加分组作业 2015-12-02 11:14:46 +08:00
lizanle 7af82aac98 base_forums要加ajax-indicator ajax-model 2015-12-02 09:28:01 +08:00
lizanle 46ad5f45c1 搜索结果下一页样式不对 2015-12-02 09:23:12 +08:00
lizanle 35b543cd22 论坛发帖 采用ajax提交。这样子网络不好的情况就不会丢失数据了。 2015-12-01 17:23:14 +08:00
lizanle d4823e7c8b 贴吧更新时间 2015-12-01 15:48:25 +08:00
lizanle 304cc078a7 去掉警示的感叹号 2015-12-01 15:30:47 +08:00
cxt 68a29d8131 学生提交作品后可点击重试重新上传作品 2015-12-01 15:18:14 +08:00
ouyangxuhua 0aba11f175 解决组织配置在360浏览器显示不兼容的问题 2015-12-01 11:28:33 +08:00
huang 9d970036f6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-30 17:21:38 +08:00
ouyangxuhua 3750a49b65 修复组织编辑下拉框的bug 2015-11-30 16:10:29 +08:00
ouyangxuhua 6f9c89d67b 1.更改首页内容，不显示作者等信息，增加取消首页、编辑首页、删除首页等功能； 
2.增加editor_of_documents表，记录文章编辑的作者、时间等，并显示首页的最后编辑人；
3.在首页编辑文章后，应返回首页。
 2015-11-30 16:04:43 +08:00
huang aa19f5f8d5 Merge branch 'gitlab_guange' into develop 
Conflicts:
	app/views/layouts/base_courses.html.erb

处理冲突
 2015-11-30 15:43:05 +08:00
huang 582a7c47a4 修改英雄版为0显示的问题 2015-11-30 15:42:00 +08:00
lizanle 7eb5d2a8fa Merge remote-tracking branch 'origin/szzh' into szzh 2015-11-30 14:59:59 +08:00
lizanle 8bd9c0c7af tip 2015-11-30 14:59:51 +08:00
huang 364c9a3a9e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
合并
 2015-11-30 14:35:37 +08:00
lizanle 29a8d1b9f5 tip 2015-11-30 13:22:01 +08:00
lizanle 62399b6d72 资源课程搜索结果添加 标签 2015-11-30 11:21:21 +08:00
lizanle d266237590 kaminari分页添加上一页下一页 2015-11-30 11:08:08 +08:00
lizanle 3c946c034a Merge branch 'szzh' into dev_zanle 
Conflicts:
	db/schema.rb
	kaminari分页添加上一页下一页
 2015-11-30 11:07:53 +08:00
lizanle 1c3bff0007 资源库的删除bug 
和右键菜单的bug
和变背景色的bug
 2015-11-30 10:39:50 +08:00
huang d67fc18988 英雄榜、贡献榜显示真实姓名 
为零的时候不显示
 2015-11-30 10:20:47 +08:00
lizanle 582cd6f5d4 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/models/attachment.rb
	db/schema.rb
 2015-11-27 18:47:02 +08:00
huang cb51545a31 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-11-27 18:03:01 +08:00
huang aefab8abf3 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 2015-11-27 18:01:28 +08:00
cxt b616612032 测验取消按钮的还原功能暂时隐藏 2015-11-27 17:57:17 +08:00
ouyangxuhua 00ac79bb34 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-27 17:28:20 +08:00
ouyangxuhua 879dee0cd6 关闭组织关联项目或课程弹窗，刷新整个页面。 2015-11-27 17:27:55 +08:00
huang a6d3ff2b14 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-27 17:18:31 +08:00
huang 41b99af7dd Merge branch 'develop' into sw_new_course 2015-11-27 17:17:21 +08:00
lizanle cb910b8d4a 系统消息添加logo 2015-11-27 17:02:37 +08:00
ouyangxuhua edea776b03 Merge branch 'szzh' into dev_hjq 2015-11-27 16:28:16 +08:00
ouyangxuhua 89d01679a7 组织中，重复的项目和组织不显示 2015-11-27 16:27:23 +08:00
huang ee7fb11acc Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-11-27 16:01:03 +08:00
huang e3e0f4ab37 鼠标移动+号显示留言 2015-11-27 16:00:43 +08:00
Gan Yi.ang 79656aa205 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 2015-11-27 15:22:18 +08:00
Gan Yi.ang c3a27151ca 修复_revision 2015-11-27 15:21:58 +08:00
cxt 85aade79ce Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 
Conflicts:
	public/stylesheets/courses.css
 2015-11-27 15:21:32 +08:00
cxt f7ac2b0ef5 老师查看学生的答卷结果 2015-11-27 15:19:13 +08:00
huang 501a8f905b Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
	public/stylesheets/courses.css
 2015-11-27 14:56:30 +08:00
huang 36b1649fbd Merge branch 'szzh' into gitlab_guange 
Conflicts:
	db/schema.rb
 2015-11-27 14:49:49 +08:00
huang 2ec78d07fa Merge branch 'szzh' into hjq_new_course 2015-11-27 14:47:16 +08:00
ouyangxuhua 25b66b5dbb 取消弹窗 2015-11-27 14:43:08 +08:00
huang 1cc6e305ed 完成新功能模块开发： 
1、如果没有成绩则不显示
2、工具框展开没有则不显示
 2015-11-27 13:52:40 +08:00
ouyangxuhua 365349878d 组织加入项目或者课程，刷新项目列表和课程列表；同时，弹窗给出关联成功的提示 2015-11-27 13:17:23 +08:00
ouyangxuhua e0f4050779 1.修改组织中关联项目和课程的内容和样式 2015-11-27 12:34:02 +08:00
Gan Yi.ang ee85cc35ed Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 2015-11-27 11:27:03 +08:00
Gan Yi.ang 1115d54d9a 非trustie用户changesets_latest_coimmit 2015-11-27 11:25:16 +08:00
ouyangxuhua 4aa827eb4a 组织页面中，点击项目收起项目列表，再点击展开列表；点击课程同样如此。 2015-11-27 11:02:48 +08:00
Tim 2d14b66336 作品列表样式调整 2015-11-27 10:56:46 +08:00
huang 042b197767 课程英雄榜界面调整 
动作触发的时候更新总分
更换迁移顺序
 2015-11-27 10:49:41 +08:00
ouyangxuhua b05708f6e8 解决一下三个bug: 
1.新建组织文章时，置标题和描述为空，点击取消按钮，却弹出“标题不能为空”的提示信息
2.课程/项目关联组织：点击取消按钮不应该直接收起关联组织列表
3.组织详情页面内再编辑组织，点击确定编辑的按钮后又返回组织列表页面，应返回组织详情页面
 2015-11-27 10:43:21 +08:00
cxt 1f2675020b 学生答题未完成时可保存试卷 2015-11-27 10:15:25 +08:00
houxiang ee746b2d64 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 
need it
 2015-11-27 10:12:00 +08:00
houxiang c6b5abba4e hide the the count of project'repo 2015-11-27 10:10:59 +08:00
ouyangxuhua 58365e8892 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/new_user.css
2.组织增加项目功能
 2015-11-27 09:50:17 +08:00
huang 8c83bbfff3 课程英雄榜数据 2015-11-27 00:48:08 +08:00
huang 061a1f602a 效果实现 2015-11-26 21:17:04 +08:00
cxt dec5980443 截止时间一到立即提交试卷 2015-11-26 17:20:17 +08:00
cxt f8621cac76 未设置考试时长时，只要还未到截止时间就可以一直提交试卷。 2015-11-26 16:57:51 +08:00
ouyangxuhua 9c3aed8028 增加组织加入课程功能 2015-11-26 16:29:50 +08:00
cxt ed9cef486f 测验列表页面的按钮调整 2015-11-26 15:21:46 +08:00
cxt b690fa0b05 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-26 14:48:01 +08:00
cxt b602e1c85d 学生答题页面显示试卷截止时间 2015-11-26 14:47:52 +08:00
Tim 5bdcdc607f 测验列表格式更改 2015-11-26 14:45:35 +08:00
cxt f1bb1bb8c2 测验列表的创建时间改成截止时间，每个测验名字前增加序号，显示发布状态 2015-11-26 14:36:19 +08:00
Tim 09e0e5e93d 单选多选还原 2015-11-26 11:10:17 +08:00
Tim 2a73751fd9 多选题样式调整 2015-11-26 10:56:24 +08:00
Tim 2b6cae5418 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/views/exercise/_show_MC.html.erb
 2015-11-26 10:29:21 +08:00
Tim a0c73a5a54 单选题样式调整 2015-11-26 10:27:32 +08:00
cxt 6513c0afee 测验题目的删除按钮增加title 2015-11-26 10:11:54 +08:00
cxt 6f4b6a6b67 填空题的候选答案不能为空，选择题和填空题至少得有一个选项或一个候选答案 2015-11-26 10:03:12 +08:00
lizanle 4efb660214 全站搜索 2015-11-26 09:57:53 +08:00
cxt 2cd1c07028 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-25 16:05:13 +08:00
cxt c7cf34500c 老师若未设置测验的发布时间则提交后立即发布 2015-11-25 16:05:02 +08:00
huang c8b1cae947 建立贡献榜表及相关关联 
部分页面
按总分排序（英雄榜）
部分页面（未完成）
 2015-11-25 15:16:33 +08:00
Tim bd7ee66e77 新建测验样式调整 2015-11-25 15:02:32 +08:00