 huang
|
ddccbd59e1
|
Merge branch 'dev_hjq' into szzh
|
2015-10-19 17:03:48 +08:00 |
|
huang
|
a8f5a7ea48
|
Merge branch 'szzh' into dev_hjq
|
2015-10-19 17:03:01 +08:00 |
|
huang
|
74284e1e71
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-10-19 17:02:03 +08:00 |
|
huang
|
7898208b16
|
私有课程上传资源都为私有
|
2015-10-19 17:01:47 +08:00 |
 ouyangxuhua
|
efbae1f003
|
修改作业消息的内容：把“你”统一改成“您”；发布作业是本人的话，改成“您发布了作业”，而非“某某老师发布了作业”等
|
2015-10-19 16:59:08 +08:00 |
 Tim
|
39d347d5c2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-19 15:51:43 +08:00 |
|
Tim
|
2ca83bc7c4
|
学校修改界面修改
|
2015-10-19 15:51:27 +08:00 |
|
ouyangxuhua
|
4deeaa0f34
|
1.增加消息：用户迟交作业时，发送不能参与匿评的消息；
2.增加消息：用户创建课程时，发送创建课程消息。
|
2015-10-19 15:45:24 +08:00 |
 cxt
|
9cf1278e99
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-19 15:42:42 +08:00 |
 lizanle
|
cf0fd2022d
|
课程创建动态 项目创建动态
|
2015-10-19 14:58:44 +08:00 |
|
huang
|
64fa435a3a
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-10-19 14:03:25 +08:00 |
|
huang
|
f189e3cde8
|
0
|
2015-10-19 14:03:08 +08:00 |
|
cxt
|
7359081fd2
|
开启匿评后学生不可删除作品附件
|
2015-10-19 13:58:05 +08:00 |
|
lizanle
|
f914d21c3f
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-19 09:55:32 +08:00 |
|
lizanle
|
5652a60c68
|
js函数节流
|
2015-10-19 09:55:19 +08:00 |
 guange
|
65e6444272
|
.
|
2015-10-18 21:31:00 +08:00 |
|
guange
|
98bd46ceb4
|
通过url识别project
|
2015-10-18 21:24:59 +08:00 |
|
guange
|
74fd461fac
|
.
|
2015-10-18 21:16:03 +08:00 |
|
guange
|
acbd690bc6
|
添加转换页面
|
2015-10-18 21:04:04 +08:00 |
|
guange
|
f1af041f24
|
gitlab key 更改
|
2015-10-18 13:56:10 +08:00 |
|
guange
|
07084a94c5
|
.
|
2015-10-18 13:50:59 +08:00 |
|
guange
|
b80a0d6366
|
.
|
2015-10-18 13:25:10 +08:00 |
|
guange
|
01d716d61f
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-10-18 13:20:40 +08:00 |
|
guange
|
3a21e9f2b0
|
修复重构错误
|
2015-10-18 13:16:58 +08:00 |
|
huang
|
765d2b875d
|
还原目录显示
|
2015-10-16 20:06:03 +08:00 |
|
cxt
|
bfdfde8028
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-16 17:32:28 +08:00 |
|
cxt
|
7dd6618345
|
非课程成员不能将帖子置顶和锁定
|
2015-10-16 17:32:17 +08:00 |
|
ouyangxuhua
|
86cd27eb17
|
消息中，系统消息的标题显示“系统消息”，而非“消息”
|
2015-10-16 17:30:46 +08:00 |
|
guange
|
6086c9304e
|
merge
|
2015-10-16 17:00:46 +08:00 |
|
lizanle
|
f25015c6b8
|
学校名字中有换行的话，需要将换行变成空格
如果聚焦的时候，学校id存在的话，那么就不需要去查询了。
如果是因为学校不存在的缘故，给出提示，说明学校必须是从下拉列表中选择
|
2015-10-16 16:59:00 +08:00 |
|
guange
|
9e8e77f3e1
|
方法重构
|
2015-10-16 16:57:45 +08:00 |
|
huang
|
b48d0ff377
|
Merge branch 'szzh' into develop
|
2015-10-16 16:57:10 +08:00 |
|
lizanle
|
7e4694f71e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-16 16:56:43 +08:00 |
|
lizanle
|
1b2bbdc577
|
学校名字中有换行的话，需要将换行变成空格
如果聚焦的时候，学校id存在的话，那么就不需要去查询了。
如果是因为学校不存在的缘故，给出提示，说明学校必须是从下拉列表中选择
|
2015-10-16 16:56:27 +08:00 |
|
huang
|
b1ba6d576a
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-10-16 16:52:44 +08:00 |
|
huang
|
5c57403041
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-16 16:50:13 +08:00 |
|
cxt
|
f58d68c61a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-16 16:31:44 +08:00 |
|
cxt
|
26eda763fe
|
帖子锁定时动态的样式调整
|
2015-10-16 16:31:31 +08:00 |
|
huang
|
178752ba8f
|
将“作品”改成“提交”
|
2015-10-16 15:42:10 +08:00 |
|
huang
|
d0eba5cc37
|
Merge branch 'szzh' into develop
|
2015-10-16 15:24:39 +08:00 |
|
huang
|
07ff8d2eb7
|
老师，非课程成员 课程动态中显示 -- 提交（作品数）
|
2015-10-16 15:23:34 +08:00 |
|
ouyangxuhua
|
4d246de1c6
|
对于被拉入或者移出某私有项目对应的消息，当用户没有访问权限，应给出提示
|
2015-10-16 15:07:09 +08:00 |
|
cxt
|
bdf7bdc13e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-16 14:51:47 +08:00 |
|
cxt
|
5f3c8d928d
|
作业批次下拉列表的样式修改
|
2015-10-16 14:51:30 +08:00 |
|
lizanle
|
f53867a841
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-16 14:49:13 +08:00 |
|
lizanle
|
707244886c
|
学校列表分页
|
2015-10-16 14:48:59 +08:00 |
|
Tim
|
1414924c78
|
课程留言格式调整
|
2015-10-16 11:01:52 +08:00 |
|
Tim
|
4dddbe9dc7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_journalsformessage.html.erb
|
2015-10-16 10:58:28 +08:00 |
|
lizanle
|
7a17186ca3
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-16 10:54:41 +08:00 |
|
lizanle
|
5b76ae50ef
|
创建学校成功给出提示
|
2015-10-16 10:54:28 +08:00 |