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

4243 Commits

Author SHA1 Message Date
sw e3d735ecfc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-11-11 08:48:27 +08:00
sw 7d93a4e4aa Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/models/user.rb
	app/views/courses/_course_form.html.erb
	db/schema.rb
 2014-11-11 08:38:58 +08:00
alan 421d47a687 注册的优化 
Signed-off-by: alan <547533434@qq.com>
 2014-11-10 16:08:41 +08:00
z9hang 9bd1af9541 #1480 项目留言区回复时间显示问题 2014-11-10 15:09:48 +08:00
z9hang 6964a787b2 Merge branch 'Homework' into develop 2014-11-10 11:20:28 +08:00
z9hang b707cbae16 评分保留两位小数点 2014-11-10 10:37:12 +08:00
z9hang dd95335a67 没有附件时打包下载500错误问题 2014-11-10 10:21:16 +08:00
z9hang 3a9ef1cfff 暂时屏蔽作品打包下载 2014-11-10 09:22:50 +08:00
alan 1468f4a8df 修改《修改资料》页面 
Signed-off-by: alan <547533434@qq.com>
 2014-11-10 08:58:38 +08:00
sw 460ba55dde Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/models/user.rb
	app/views/courses/_course_form.html.erb
	db/schema.rb
 2014-11-08 16:40:36 +08:00
sw bf10e0234b Merge branch 'develop' into szzh 2014-11-08 16:35:25 +08:00
sw 606c6a62e4 Merge branch 'Homework' into develop 2014-11-08 15:32:31 +08:00
z9hang b45e23d837 学生匿评份初始值显示修正 2014-11-08 15:20:43 +08:00
sw 63d233ee42 课程实践-->课程作业 2014-11-08 14:06:06 +08:00
z9hang e297bb2687 修改匿评 2014-11-08 14:03:02 +08:00
z9hang f0377ffae7 学生匿评修改 2014-11-08 13:52:18 +08:00
sw 6157a67e23 Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework 2014-11-08 13:44:41 +08:00
sw e0d85f72a1 1.匿评作业列表我的分数显示不正确 
2.学生可多次进行匿评评分
 2014-11-08 13:43:29 +08:00
z9hang cd1be67b8c 学生可多次评分、评分完毕不在提示评分成功 2014-11-08 13:43:07 +08:00
z9hang c68e68af96 Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework 2014-11-07 16:38:11 +08:00
z9hang cc71682e40 评分前添加无法修改提示 2014-11-07 13:51:18 +08:00
sw e550f9d91d Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework 2014-11-07 11:02:33 +08:00
sw 35cb7273a8 课程实践->课程作业 2014-11-07 11:02:10 +08:00
sw ffaa9c51ba 修复作业列表报错 
修复2个关闭按钮
 2014-11-07 10:39:17 +08:00
sw 759d69892e 修改弹出框样式 2014-11-07 10:37:10 +08:00
sw be500eb0d2 增加开启匿评关闭匿评弹出框动态显示 2014-11-07 10:02:13 +08:00
gonglexin 972d748199 #1434 解决文件重复上传的问题 2014-11-06 19:34:31 +08:00
sw 54aae26cbe 被除数为0时弹框报错 2014-11-06 17:23:43 +08:00
z9hang 89732c51ef Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework 
Conflicts:
	app/views/homework_attach/_homework.html.erb
 2014-11-06 16:58:05 +08:00
z9hang 9b4e9bd04a 1、部分星星显示不正确问题，2、评分初始值设置为0 2014-11-06 16:52:29 +08:00
sw 6c13a682c0 修改评分为nil报错 2014-11-06 16:37:30 +08:00
sw 0a8d0182fd Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework 2014-11-06 16:08:14 +08:00
z9hang 0d31ec53b5 Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework 2014-11-06 16:06:08 +08:00
z9hang 5034769ab3 星星显示不全问题 2014-11-06 16:05:47 +08:00
sw 2a8e40603c 修改作业弹出框样式 2014-11-06 16:05:12 +08:00
sw f3edbe4b79 修改作业连接错误 2014-11-06 16:01:07 +08:00
alan fd8a8d1fe2 Signed-off-by: alan <547533434@qq.com> 2014-11-06 15:58:15 +08:00
sw a19a3b3f43 Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework 2014-11-06 15:50:59 +08:00
sw b8c9651079 111 2014-11-06 15:50:39 +08:00
z9hang 3689b5e228 Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework 2014-11-06 15:19:55 +08:00
z9hang 3416b4c047 #1435 课程--课程实践：“学生提问”应该有个数字标识学生留言的数量 2014-11-06 15:17:36 +08:00
sw a5202e53a4 Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework 2014-11-06 14:56:52 +08:00
sw 14db93c10a 教师作业列表增加当前作业提交信息,匿评信息提示 2014-11-06 14:56:14 +08:00
z9hang 373ba9fb33 1、用户名过长的显示问题。2、部分内容过长的回复的与头像不在同一行问题 2014-11-06 14:51:25 +08:00
alan 0aae731eef 修改bug<点击排序后内容类型自动变为全部，但又并未显示全部资源> 
Signed-off-by: alan <547533434@qq.com>
 2014-11-06 14:45:59 +08:00
sw 48aacc70c9 调整学生新建、修改作业时的样式 2014-11-06 13:53:57 +08:00
sw e2c034dcef 修改关闭匿评之后，学生匿评列表显示为已评列表，学生评分显示为我的评分 
分数显示为我对该作业的评分
 2014-11-06 11:58:26 +08:00
sw 8fbbbe82e0 修改作业左上角课程、作业名称显示 2014-11-06 11:47:28 +08:00
sw f149dd3a57 我的作品应该是缺省显示的tab，等到老师启动匿评后，待评作品才是缺省tab 
学生的作业主页中，“所有作品”应该是缺省的tab页
 2014-11-06 10:58:07 +08:00
sw 7d97889261 Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework 
Conflicts:
	app/views/bids/_bid_homework_show.html.erb
	app/views/layouts/base_homework.html.erb
 2014-11-06 09:01:01 +08:00