 lizanle
|
eaf4ad354f
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
app/services/courses_service.rb
app/views/courses/join.js.erb
public/stylesheets/new_user.css
|
2015-10-26 10:21:13 +08:00 |
|
lizanle
|
3b5b203b2e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-24 16:16:11 +08:00 |
|
lizanle
|
4431f4664f
|
点击确定自动关闭
|
2015-10-24 16:16:04 +08:00 |
 ouyangxuhua
|
6924a3e7bb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-24 16:13:05 +08:00 |
|
lizanle
|
1705bd169e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-24 16:12:17 +08:00 |
|
lizanle
|
479b23a1fd
|
重复加入问题给出提示
并不发送消息
不允许重复发送相同的申请
点击确定自动关闭
|
2015-10-24 16:12:03 +08:00 |
|
ouyangxuhua
|
a42a58fb42
|
修改火狐浏览器出现多余省略号的问题
|
2015-10-24 16:09:44 +08:00 |
|
lizanle
|
5e4e5419f1
|
只有编辑的时候才允许删除资源
|
2015-10-24 15:37:27 +08:00 |
|
lizanle
|
2a76461cd1
|
简单博客功能
|
2015-10-24 15:34:43 +08:00 |
|
ouyangxuhua
|
c7688b981a
|
更新启动匿评提示信息，以便用户更清楚匿评过程
|
2015-10-24 15:27:27 +08:00 |
 cxt
|
274db8d080
|
作品列表页面的作业信息添加附件的显示
|
2015-10-24 14:53:49 +08:00 |
|
cxt
|
882d64fc02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-24 14:47:26 +08:00 |
|
cxt
|
e43822cc30
|
无法同时引用多个资源库的资源
|
2015-10-24 14:47:13 +08:00 |
|
lizanle
|
cf83209c58
|
原来的提交被覆盖了。
|
2015-10-24 12:03:36 +08:00 |
|
lizanle
|
b27a0f2e51
|
学校分页
|
2015-10-24 11:37:38 +08:00 |
|
lizanle
|
0be91202d7
|
学校分页
|
2015-10-24 11:36:08 +08:00 |
|
lizanle
|
69d5f8b97b
|
课程不存在的时候的提示
|
2015-10-24 11:19:11 +08:00 |
|
lizanle
|
389792bd11
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-24 11:13:11 +08:00 |
|
lizanle
|
b448e1a4c5
|
课程加入消息错误
|
2015-10-24 11:13:01 +08:00 |
|
lizanle
|
9d89da7e66
|
课程加入消息错误
|
2015-10-24 11:11:49 +08:00 |
|
cxt
|
787b9af429
|
编辑作业时选不了资源库资源
|
2015-10-24 10:47:04 +08:00 |
|
ouyangxuhua
|
16f0868df3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-23 16:28:40 +08:00 |
|
ouyangxuhua
|
bc3fbc270f
|
将学生改成同学
|
2015-10-23 16:28:22 +08:00 |
 Tim
|
4bedc81524
|
作品列表提交按钮位置调整
|
2015-10-23 16:26:58 +08:00 |
|
Tim
|
83b984a909
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-23 15:46:09 +08:00 |
|
Tim
|
b063be917b
|
附件图标更改；弹窗文字上padding减小
|
2015-10-23 15:45:48 +08:00 |
|
cxt
|
1ddb21d0a9
|
动态中的描述展开时去掉line-height，收起时添加line-height
|
2015-10-23 14:53:53 +08:00 |
|
cxt
|
adfe9ce7df
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-23 14:46:12 +08:00 |
|
cxt
|
fde4ce74ba
|
作业配置菜单增加评分设置
|
2015-10-23 14:45:56 +08:00 |
|
ouyangxuhua
|
4a188dc81d
|
对所有作业消息，统一在内容前加圆点，并且调整颜色
|
2015-10-23 14:28:24 +08:00 |
|
ouyangxuhua
|
9375227250
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-23 09:33:29 +08:00 |
|
ouyangxuhua
|
7845a0e712
|
修改作业消息的内容及样式
|
2015-10-23 09:33:16 +08:00 |
|
cxt
|
717baed23b
|
匿评结束后动态和作业列表中的“作品匿评”改为“匿评结束”
|
2015-10-23 09:19:19 +08:00 |
|
cxt
|
e2990fb55c
|
控制动态描述的高度为20行，可展开和收起。
|
2015-10-22 17:42:02 +08:00 |
|
cxt
|
5e7b774111
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-22 16:57:50 +08:00 |
|
cxt
|
4b6f8efc5a
|
作品列表添加作业信息
|
2015-10-22 16:57:36 +08:00 |
|
ouyangxuhua
|
41b7b2df3b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-22 15:44:06 +08:00 |
|
ouyangxuhua
|
f7545e623b
|
解决作业提交截止日期快到时，多发送一条消息的bug
|
2015-10-22 15:41:52 +08:00 |
|
lizanle
|
35719f9c28
|
消息处理路由
|
2015-10-22 15:41:20 +08:00 |
|
ouyangxuhua
|
4b8c65d12e
|
消息处理
|
2015-10-22 14:31:14 +08:00 |
|
cxt
|
32ad320cef
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-22 09:20:31 +08:00 |
|
cxt
|
7e21c00aed
|
添加作业的回复功能
|
2015-10-22 09:20:19 +08:00 |
|
ouyangxuhua
|
1c6f17936f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_message_course.html.erb
|
2015-10-22 09:12:08 +08:00 |
|
ouyangxuhua
|
7f1524ebe1
|
修复当学生被剔除课程成员时，消息页面报错的bug.
|
2015-10-22 09:05:51 +08:00 |
|
lizanle
|
75ee45b2d1
|
消息已阅！
|
2015-10-21 15:03:46 +08:00 |
|
lizanle
|
e44d95cca5
|
添加申请课程的加入身份
|
2015-10-21 14:52:00 +08:00 |
|
ouyangxuhua
|
0b8053c5d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-20 17:32:19 +08:00 |
|
ouyangxuhua
|
ab97ba4aa0
|
增加请求加入课程消息
|
2015-10-20 17:31:58 +08:00 |
|
lizanle
|
0fffed55a6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-20 17:27:14 +08:00 |
|
lizanle
|
a817c3b81e
|
添加身份
|
2015-10-20 17:27:06 +08:00 |