 sw
|
f6f3d83c5e
|
1、老师、学生打分
2、评论及评论的回复功能
|
2015-09-17 16:31:32 +08:00 |
 ouyangxuhua
|
43eeb8f457
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-17 16:25:46 +08:00 |
|
ouyangxuhua
|
d31b1d99a9
|
修改系统消息样式
|
2015-09-17 16:25:30 +08:00 |
 huang
|
9324d45e2c
|
系统消息发布添加标题功能
|
2015-09-17 16:23:09 +08:00 |
|
ouyangxuhua
|
47d734e0d9
|
修改系统消息图片大小
|
2015-09-17 16:23:03 +08:00 |
 Tim
|
062a9ff231
|
上传头像确定，取消按钮字号大小统一
|
2015-09-17 16:12:31 +08:00 |
|
huang
|
d00ad2e14d
|
1、作业截止时间邮件通知
2、系统消息通知路由、方法定义
|
2015-09-17 16:07:41 +08:00 |
|
Tim
|
a99d56b2e6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-17 16:04:52 +08:00 |
|
Tim
|
3dccf8f77d
|
动态页面菜单栏图标更改；
提交作业界面图标宽度更改。
|
2015-09-17 16:04:27 +08:00 |
|
sw
|
c4abe6b413
|
shou页面的展示以及留言功能
|
2015-09-17 16:04:16 +08:00 |
 cxt
|
68338c46e1
|
个人动态按最后更新时间排序
|
2015-09-17 15:50:33 +08:00 |
|
huang
|
7a014e1f79
|
解决bug：自动注册用户时，邮箱名过长超过login限制
解决方法：login长度和邮箱长度同步
|
2015-09-17 15:24:12 +08:00 |
|
cxt
|
6c99674798
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-17 14:59:01 +08:00 |
|
cxt
|
3f7c69e8e1
|
动态的判断
|
2015-09-17 14:58:10 +08:00 |
|
huang
|
b943a1de63
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-17 14:41:56 +08:00 |
|
huang
|
b9fc410802
|
添加系统消息单独新页面
|
2015-09-17 14:41:03 +08:00 |
|
ouyangxuhua
|
d4e1c62989
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-17 14:38:17 +08:00 |
|
ouyangxuhua
|
99d6012718
|
项目邀请
|
2015-09-17 14:37:45 +08:00 |
|
sw
|
47cdf1231d
|
匿评评分，成绩提示框的显示
|
2015-09-17 14:26:41 +08:00 |
|
sw
|
53d6c6853d
|
作品列表的显示
|
2015-09-17 14:16:13 +08:00 |
|
huang
|
b5f4b1dd96
|
功能：24小时内系统消息显示
|
2015-09-17 13:58:55 +08:00 |
|
huang
|
e7fc0ca6d3
|
休整消息样式
|
2015-09-17 13:44:52 +08:00 |
|
huang
|
cfcf1f8103
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-17 13:00:30 +08:00 |
|
huang
|
7cdebab5e5
|
1、修改系统消息样式
2、解决新注册用户系统消息红点不显示问题
3、调整消息样式
|
2015-09-17 12:59:52 +08:00 |
|
ouyangxuhua
|
d21dce566f
|
修改新闻显示的word-break 和 word-wrap
|
2015-09-17 11:42:18 +08:00 |
|
sw
|
efdd717c3c
|
成绩计算算法的实现
|
2015-09-17 11:41:24 +08:00 |
|
Tim
|
9a735c7157
|
模拟测试提示添加
|
2015-09-17 11:13:36 +08:00 |
|
sw
|
3573179403
|
匿评作品列表 标题头没有对齐
|
2015-09-17 10:32:41 +08:00 |
|
Tim
|
5612bb47dd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-17 10:25:46 +08:00 |
|
Tim
|
0930815086
|
回复头像模糊效果
|
2015-09-17 10:25:26 +08:00 |
|
sw
|
90d70e7c88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-17 10:24:58 +08:00 |
|
sw
|
84bb5af86f
|
增加教师优先字段
|
2015-09-17 10:24:37 +08:00 |
|
ouyangxuhua
|
d5432a8464
|
修改发送项目请求列表样式
|
2015-09-17 10:22:33 +08:00 |
|
sw
|
1ed1957899
|
教辅评分、系统评分、学生匿评 比例默认设置
|
2015-09-17 10:21:01 +08:00 |
|
sw
|
22d4499f8f
|
缺评、迟交扣分还是改为 直接扣多少分
|
2015-09-17 10:06:04 +08:00 |
|
cxt
|
501d9101f0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-17 10:02:37 +08:00 |
|
cxt
|
036129a622
|
动态回复后的回复框样式不改变
|
2015-09-17 10:02:28 +08:00 |
|
sw
|
fa9008d396
|
作品在非匿评阶段的显示
|
2015-09-17 10:00:41 +08:00 |
|
sw
|
9a859d28bf
|
增加匿评时作品的显示
|
2015-09-17 09:20:35 +08:00 |
|
Tim
|
1085c9c53f
|
添加，取消关注图标恢复
|
2015-09-17 09:06:01 +08:00 |
|
Tim
|
5b6ac4564a
|
回复框头像路径改变
|
2015-09-17 08:46:43 +08:00 |
|
huang
|
94f91a85e6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-16 17:36:10 +08:00 |
|
huang
|
67f7fc7de3
|
注释掉“邀请系统注册用户”，因为邀请用户中已经包含该功能
|
2015-09-16 17:35:26 +08:00 |
|
ouyangxuhua
|
1476489921
|
增加鼠标经过提示title
|
2015-09-16 17:35:08 +08:00 |
|
huang
|
d602e62119
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-16 17:25:43 +08:00 |
|
huang
|
c9d52571f0
|
1、项目邀请中添加两种特殊情况的判断。
2、完成邀请状态列表界面。
3、优化之前的邀请状态逻辑。
|
2015-09-16 17:25:06 +08:00 |
|
Tim
|
3d5f93b938
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_course_news.html.erb
app/views/users/_project_issue.html.erb
app/views/users/_project_message.html.erb
app/views/users/_user_activities.html.erb
public/stylesheets/new_user.css
|
2015-09-16 16:13:40 +08:00 |
|
sw
|
939a010adb
|
静态页面添加
|
2015-09-16 15:51:35 +08:00 |
|
cxt
|
3bdab22aca
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-16 15:40:24 +08:00 |
|
cxt
|
a184ab4b69
|
个人动态首页只显示第一个动态的回复框，其它的需点击才显示
|
2015-09-16 15:40:05 +08:00 |