 alan
|
e7545b1cd9
|
增加《注册后跳转邮箱》页面
Signed-off-by: alan <547533434@qq.com>
|
2014-11-13 10:20:55 +08:00 |
|
alan
|
12de248e87
|
Signed-off-by: alan <547533434@qq.com>
|
2014-11-13 10:18:07 +08:00 |
|
alan
|
e86ef8e6f0
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-13 09:59:34 +08:00 |
|
alan
|
b7a89d6108
|
Merge branch 'shaproup' into szzh
Conflicts:
app/models/course.rb
app/models/project.rb
app/views/contests/show_attendingcontest.html.erb
app/views/files/_course_file.html.erb
app/views/files/_course_new.html.erb
app/views/layouts/_base_footer.html.erb
Signed-off-by: alan <547533434@qq.com>
|
2014-11-13 09:59:20 +08:00 |
 z9hang
|
43931e921a
|
合作单位修改时错误提示信息为英文问题
|
2014-11-13 09:40:45 +08:00 |
 sw
|
fae3de8e04
|
老师打包后姓和名反了
|
2014-11-13 09:24:40 +08:00 |
|
sw
|
23f4d760e6
|
修改老师打包下载第二次文件名为学生真实姓名_学生学号_时间
|
2014-11-13 09:16:01 +08:00 |
|
alan
|
e9d75bde6f
|
《修改资料》页面：工作单位为不必填
Signed-off-by: alan <547533434@qq.com>
|
2014-11-13 09:14:40 +08:00 |
|
alan
|
baacf328b7
|
增加《注册跳转邮箱页面》
Signed-off-by: alan <547533434@qq.com>
|
2014-11-13 09:13:44 +08:00 |
|
sw
|
56cc2a7ad3
|
修复老师编辑作业时课程作业tab没有高亮显示
|
2014-11-12 17:07:27 +08:00 |
|
z9hang
|
227a7c1f31
|
z作业留言的字数控制
|
2014-11-12 17:02:35 +08:00 |
|
sw
|
a24d1493f9
|
1.修复点击课程动态，课程动态tab页不高亮显示
2.修复点击新建作业，课程作业tab页不高亮显示
|
2014-11-12 16:51:07 +08:00 |
|
z9hang
|
e6aa9d3592
|
修复用户、课程、项目、竞赛、留言模块样式，去除回复时的回复某某字样，及字数控制
|
2014-11-12 15:09:39 +08:00 |
|
alan
|
ad6b32ff50
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-11 17:01:29 +08:00 |
|
alan
|
2cea3178d6
|
添加邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
2014-11-11 17:01:07 +08:00 |
|
sw
|
dbf08bc486
|
Merge branch 'Homework' into szzh
|
2014-11-11 15:19:28 +08:00 |
|
sw
|
31ad012bee
|
修改第一次打包下载成功，后面打包下载失败的BUG
|
2014-11-11 14:41:07 +08:00 |
|
sw
|
3c2c9149b1
|
取消新建、修改作业的必填标志
|
2014-11-11 11:51:17 +08:00 |
|
sw
|
ab791f6386
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-11 11:41:04 +08:00 |
|
sw
|
1c50646677
|
修改打包下载文件名为创建该作业的学生姓名_学生学号
|
2014-11-11 11:39:57 +08:00 |
|
sw
|
ecd5a7b2fb
|
修复作业打包下载无法下载的BUG
|
2014-11-11 11:16:37 +08:00 |
|
z9hang
|
2b829db804
|
教师打开评分界面时，评分处显示其上次的评分
|
2014-11-11 11:05:56 +08:00 |
|
sw
|
5d9f54c93b
|
#1490个人主页导航栏中显示课程作业
|
2014-11-11 09:50:21 +08:00 |
|
sw
|
9d971069b5
|
Merge branch 'Homework' into szzh
|
2014-11-11 08:49:42 +08:00 |
|
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 |