 guange
|
921d2fc422
|
erge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-03 16:59:24 +08:00 |
|
guange
|
6063f39eac
|
修改作业的一些链接和跳转问题
|
2015-09-03 16:58:38 +08:00 |
 huang
|
f1431b27fc
|
Merge branch 'develop' into szzh
Conflicts:
app/views/users/user_messages.html.erb
|
2015-09-03 16:28:49 +08:00 |
|
huang
|
bf2e63b7be
|
去掉消息界面“未读”和已读
|
2015-09-03 16:09:40 +08:00 |
|
guange
|
bacb5f859b
|
merge
|
2015-09-02 21:41:13 +08:00 |
|
guange
|
a69cee4b26
|
老师测试功能
|
2015-09-02 21:38:13 +08:00 |
|
huang
|
8b9eabd027
|
迁移文件中添加打印收据
添加未读消息样式
|
2015-09-02 18:35:12 +08:00 |
|
huang
|
4c76292e5e
|
message--viewed
|
2015-09-02 18:00:36 +08:00 |
|
huang
|
43f99c45e8
|
消息
|
2015-09-02 14:37:57 +08:00 |
|
huang
|
487881bb92
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
|
2015-09-02 14:15:38 +08:00 |
|
huang
|
a2079dc6e3
|
用户留言消息状态更新
|
2015-09-02 14:13:32 +08:00 |
|
huang
|
87956ee48c
|
用户留言消息区分已读和未读
|
2015-09-02 11:50:58 +08:00 |
|
huang
|
d980513551
|
添加查看通知/新闻的消息状态更新
|
2015-09-02 10:08:37 +08:00 |
|
huang
|
e89fbd2c8e
|
过滤条件改为同种类型过滤
|
2015-09-01 17:37:43 +08:00 |
 cxt
|
d845b8373a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 16:37:53 +08:00 |
|
cxt
|
21565b74fe
|
冲突
|
2015-09-01 16:37:43 +08:00 |
|
guange
|
8ad521d4ab
|
merge
|
2015-09-01 16:19:48 +08:00 |
|
guange
|
41f9daed6d
|
编程作业放入到users controller
|
2015-09-01 16:18:03 +08:00 |
 sw
|
5f42ce4c80
|
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
|
2015-09-01 15:28:03 +08:00 |
 lizanle
|
7223e6c91c
|
引用发送资源时刷新资源列表和统计
|
2015-09-01 15:03:24 +08:00 |
|
lizanle
|
b3e3737fb5
|
发布作业时从资源库选择资源功能
|
2015-09-01 11:29:43 +08:00 |
|
sw
|
b3919256fa
|
111
|
2015-09-01 09:17:12 +08:00 |
|
cxt
|
5ddefe21b8
|
个人主页3080账户动态异常bug
|
2015-08-29 16:39:37 +08:00 |
|
lizanle
|
acbf58837a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-29 12:32:08 +08:00 |
|
lizanle
|
ad8bd379a1
|
用户资源过滤
|
2015-08-29 12:32:00 +08:00 |
|
sw
|
4ade77f3d0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 12:04:57 +08:00 |
|
sw
|
86e9ec068f
|
新建作业时，作业截止时间为空
|
2015-08-29 11:12:18 +08:00 |
|
cxt
|
c650c83f82
|
个人主页报500、动态显示错位的bug修复
|
2015-08-29 10:16:04 +08:00 |
|
huang
|
3a25f44d83
|
Merge branch 'dev_hjq' into szzh
|
2015-08-28 17:07:48 +08:00 |
|
sw
|
014881bd42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
2015-08-28 17:02:49 +08:00 |
|
sw
|
76ec0d5d48
|
资源库导入资源到作业静态页面
|
2015-08-28 16:47:43 +08:00 |
|
huang
|
5384e7eee8
|
消息每种类型为空的时候给出提示
|
2015-08-28 15:51:42 +08:00 |
|
huang
|
9bc491227b
|
Merge branch 'szzh' into dev_hjq
|
2015-08-28 14:49:55 +08:00 |
|
sw
|
462b0a82a0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-28 11:56:52 +08:00 |
|
sw
|
2fa03c3102
|
导入作业功能完成
|
2015-08-28 11:32:57 +08:00 |
|
lizanle
|
f9651d853c
|
资源每页显示的个数
|
2015-08-28 10:47:50 +08:00 |
|
sw
|
007a39b5d5
|
作业列表的过滤查询
|
2015-08-28 10:00:48 +08:00 |
|
huang
|
9709692a08
|
修改消息每页的显示个数
|
2015-08-28 09:55:23 +08:00 |
|
sw
|
c5ad5a3a5a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-27 17:35:04 +08:00 |
|
huang
|
1b9da8d963
|
消息添加分页功能
|
2015-08-27 16:57:32 +08:00 |
|
sw
|
cb5abc6d74
|
导入作业弹框
|
2015-08-27 16:03:41 +08:00 |
|
lizanle
|
54c849cccb
|
发送资源的时候不选任何课程项目的时候不要弹出框发送成功
|
2015-08-27 11:02:20 +08:00 |
|
sw
|
19dc9de60f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 17:58:04 +08:00 |
|
cxt
|
a7ce1168db
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 17:58:59 +08:00 |
|
cxt
|
caec5e5490
|
个人主页动态
|
2015-08-26 17:58:48 +08:00 |
|
sw
|
db70425d99
|
Merge branch 'szzh' into sw_new_course
|
2015-08-26 17:57:54 +08:00 |
|
sw
|
dafc128f34
|
增加部分默认参数的设置
|
2015-08-26 17:44:03 +08:00 |
|
sw
|
650d0c8cb5
|
匿评分配数量默认为3
|
2015-08-26 17:42:52 +08:00 |
|
sw
|
b7cbb9b0c2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
2015-08-26 17:31:37 +08:00 |
|
sw
|
049e27f15f
|
发布作业功能
|
2015-08-26 17:29:47 +08:00 |