 z9hang
|
b462d4e00a
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-05 10:41:50 +08:00 |
|
z9hang
|
b141db6624
|
用户留言修复
|
2014-11-05 10:41:34 +08:00 |
 sw
|
0151caa00c
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-05 10:14:24 +08:00 |
|
sw
|
55b7d12908
|
增加判断：匿评分配数量必须大于0
|
2014-11-05 10:14:02 +08:00 |
|
sw
|
54a9044679
|
修改匿评个数可配置、以及增加其相关js验证
|
2014-11-05 10:06:20 +08:00 |
|
z9hang
|
3b073eec74
|
修正留言样式
|
2014-11-05 10:05:43 +08:00 |
|
z9hang
|
24dc839a39
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-05 09:52:00 +08:00 |
|
z9hang
|
7d4d3f590c
|
项目、课程、竞赛留言模块分页控件修复
|
2014-11-05 09:51:30 +08:00 |
|
sw
|
eb551788ac
|
1.修复匿评列表查询不正确
2.匿评分配支持2份作业分配
3.匿评分配不正确提示
|
2014-11-05 09:16:06 +08:00 |
|
sw
|
3f2aa9cad1
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
app/views/layouts/base_homework.html.erb
|
2014-11-05 08:53:19 +08:00 |
 gonglexin
|
ed258a98ba
|
作业分配算法优化
|
2014-11-04 21:43:14 +08:00 |
|
gonglexin
|
1c7b6aa17e
|
阻止用户多次点击启动匿评链接
|
2014-11-04 19:51:24 +08:00 |
|
sw
|
cf952b5012
|
Merge branch 'Homework' into develop
|
2014-11-04 18:34:34 +08:00 |
|
sw
|
a08f944d85
|
修复错误
|
2014-11-04 18:33:41 +08:00 |
|
z9hang
|
13c3ac8551
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-04 18:31:16 +08:00 |
|
z9hang
|
07c21e97d6
|
修复竞赛、课程、项目留言模块样式
|
2014-11-04 18:30:45 +08:00 |
|
sw
|
4d1730f92e
|
修改
|
2014-11-04 17:48:18 +08:00 |
|
sw
|
22ada089be
|
Merge branch 'Homework' into develop
|
2014-11-04 17:11:55 +08:00 |
|
sw
|
2f8f8593eb
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-04 17:00:09 +08:00 |
|
sw
|
b0886e0663
|
增加开启、关闭匿评之前的提示
|
2014-11-04 16:59:49 +08:00 |
|
sw
|
d520f1cdb4
|
新增和修改作业增加js验证
|
2014-11-04 16:27:34 +08:00 |
|
sw
|
13c362b08d
|
1.作业排序按钮显示顺序
2.配置课程->配置 关闭课程 -> 关闭 加入课程->加入
|
2014-11-04 16:19:52 +08:00 |
|
sw
|
cc69b06616
|
作业左侧增加开启/关闭匿评按钮
|
2014-11-04 16:15:36 +08:00 |
|
z9hang
|
ff343b437c
|
调整匿评评论的样式
|
2014-11-04 16:05:08 +08:00 |
|
sw
|
def7a7f5e3
|
作业增加按教师评分/匿评/时间排序
|
2014-11-04 16:01:55 +08:00 |
|
z9hang
|
fced7dcb91
|
进入自己的作业不让评分
|
2014-11-04 15:46:24 +08:00 |
|
sw
|
334a99bcef
|
1.取消老师修改作业时启动互评按钮显示
2创建作业改为提交作业
3.修改不能评分时的样式
|
2014-11-04 15:41:10 +08:00 |
|
sw
|
0f14fbef98
|
增加判断：作业总数大于4份时才可以开启匿评
增加不可重复开启匿评
|
2014-11-04 14:53:49 +08:00 |
|
z9hang
|
b506a961a1
|
1、回复匿名评论时显示出了名字bug。2、样式调整
|
2014-11-04 14:49:36 +08:00 |
|
sw
|
e7a1e9b325
|
修改弹出框样式，使其位于屏幕中间，且增加边框
|
2014-11-04 14:23:24 +08:00 |
|
sw
|
59849be07a
|
Merge branch 'Homework' into develop
|
2014-11-04 13:34:46 +08:00 |
|
z9hang
|
316c407a87
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-04 10:58:04 +08:00 |
|
z9hang
|
4a72dd3380
|
1、留言中时间显示不正确问题。2教师评论失败问题
|
2014-11-04 10:57:56 +08:00 |
|
sw
|
df7744e22e
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-04 10:41:57 +08:00 |
|
sw
|
6c75dc6af3
|
增加老师、学生评分后列表界面刷新的js
|
2014-11-04 10:41:34 +08:00 |
|
z9hang
|
385009b688
|
留言区时间显示问题
|
2014-11-04 10:22:48 +08:00 |
|
z9hang
|
1ec82a923e
|
1、重新进入留言界面后，不能删除自己的留言bug。2、删除留言后留言数量未变问题
|
2014-11-04 10:07:15 +08:00 |
|
z9hang
|
c3152b55de
|
创建作业后路由跳转错误问题
|
2014-11-04 09:30:17 +08:00 |
|
z9hang
|
b876a7b063
|
将评论标签页切换改为鼠标点击切换
|
2014-11-04 09:22:29 +08:00 |
|
gonglexin
|
f9cc819ab3
|
解决点击清楚留言页面跳动的问题
|
2014-11-03 20:18:33 +08:00 |
|
gonglexin
|
6dfb997ffe
|
评分之后关闭弹出窗口之后刷新未评分作品页面
|
2014-11-03 19:27:30 +08:00 |
|
sw
|
1ec6b53d76
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-03 18:54:50 +08:00 |
|
sw
|
a4b14c3a53
|
修改作业详细信息弹出框js关闭窗口以及弹出框关闭按钮样式
|
2014-11-03 18:54:34 +08:00 |
|
sw
|
e2897b3d1a
|
修改匿评弹出框样式
|
2014-11-03 18:45:53 +08:00 |
|
z9hang
|
990c37061b
|
调整按钮样式
|
2014-11-03 18:34:06 +08:00 |
|
z9hang
|
86653c7b66
|
修改按钮样式
|
2014-11-03 18:14:57 +08:00 |
|
z9hang
|
e3b0b8e9e1
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-03 17:31:23 +08:00 |
|
z9hang
|
2d157e1898
|
匿评逻辑判断完善
|
2014-11-03 17:31:04 +08:00 |
|
sw
|
b625a857e9
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-03 17:20:04 +08:00 |
|
sw
|
caec663fe4
|
修改编辑作业界面样式
|
2014-11-03 15:52:41 +08:00 |