 sw
|
f18367d550
|
Merge branch 'dev_hjq' into szzh
|
2015-06-09 14:11:12 +08:00 |
 huang
|
dd27e1c301
|
Merge branch 'szzh' into dev_hjq
|
2015-06-09 13:01:36 +08:00 |
|
huang
|
46952212e4
|
Merge branch 'dev_hjq' into szzh
|
2015-06-09 13:00:11 +08:00 |
|
huang
|
05a77caeda
|
去掉讨论区重复及统计数量错误
|
2015-06-09 12:58:54 +08:00 |
 lizanle
|
0847002995
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-06-08 17:16:39 +08:00 |
|
lizanle
|
7d76b20574
|
作业那块逻辑修改，对于作业的学生提问以及回复功能需要取消
|
2015-06-08 17:16:34 +08:00 |
|
huang
|
8375332f4d
|
Merge branch 'dev_hjq' into szzh
|
2015-06-08 15:59:02 +08:00 |
|
huang
|
f2482404f9
|
Merge branch 'szzh' into dev_hjq
|
2015-06-08 15:58:06 +08:00 |
|
sw
|
0ba7b68e1a
|
Merge branch 'szzh' into develop
|
2015-06-08 15:57:40 +08:00 |
|
huang
|
f0879ba536
|
Merge branch 'dev_hjq' into szzh
|
2015-06-08 15:55:01 +08:00 |
|
huang
|
7c6b861c9d
|
Merge branch 'szzh' into dev_hjq
|
2015-06-08 15:53:27 +08:00 |
|
huang
|
999e96a857
|
取消掉打印attachment
|
2015-06-08 15:45:12 +08:00 |
 yutao
|
29edf5ece7
|
解决kindeditor多编辑器的bug
|
2015-06-08 14:46:25 +08:00 |
|
huang
|
4f9459dfef
|
Merge branch 'szzh' into dev_hjq
|
2015-06-08 14:38:59 +08:00 |
|
huang
|
370bae787f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-08 14:32:44 +08:00 |
|
huang
|
52f7c66ff0
|
修复课程讨论区中邮件通知重复的问题
|
2015-06-08 14:32:10 +08:00 |
|
lizanle
|
949356c37b
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
2015-06-08 09:07:55 +08:00 |
|
lizanle
|
0e2db5fc73
|
schema
|
2015-06-08 09:07:32 +08:00 |
|
sw
|
da9a607a5b
|
第一次评论后添加附件，评论不刷想
|
2015-06-06 16:11:37 +08:00 |
|
huang
|
38e4d90a1c
|
Merge branch 'dev_hjq' into szzh
|
2015-06-06 12:14:23 +08:00 |
|
sw
|
e52751f5e0
|
Merge branch 'szzh' into develop
|
2015-06-06 12:13:37 +08:00 |
|
sw
|
d477d44d4b
|
Merge branch 'dev_hjq' into szzh
|
2015-06-06 12:13:00 +08:00 |
|
huang
|
18f0c6fa0c
|
Merge branch 'szzh' into dev_hjq
|
2015-06-06 12:11:28 +08:00 |
|
sw
|
6a997bace3
|
学生姓名颜色调整
匿评列表学号显示--
|
2015-06-06 12:11:19 +08:00 |
|
huang
|
ffa3d479c0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-06 12:10:43 +08:00 |
|
huang
|
5a9e3c685b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-06-06 11:40:03 +08:00 |
|
huang
|
543ae1bbd0
|
修改邀请加入项目逻辑：改成已加入和等待加入
|
2015-06-06 11:39:22 +08:00 |
|
sw
|
da4127245f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-06-06 10:22:57 +08:00 |
|
huang
|
7e89cd27aa
|
邮件邀请bug修改
|
2015-06-06 10:22:56 +08:00 |
|
sw
|
1a3a23b0ed
|
BId已取消留言功能
|
2015-06-06 09:44:37 +08:00 |
|
huang
|
b1ce342b3d
|
修改作业表修改后引起的问题
|
2015-06-06 09:44:23 +08:00 |
|
sw
|
cd631f8fdc
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-06-06 09:42:38 +08:00 |
|
huang
|
a9a79ae70d
|
Merge branch 'szzh' into dev_hjq
|
2015-06-05 17:19:27 +08:00 |
|
huang
|
dae9d5622d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-05 17:19:02 +08:00 |
|
sw
|
1d347bd1c6
|
Merge branch 'szzh' into develop
|
2015-06-05 17:18:31 +08:00 |
|
sw
|
3b954dfd16
|
Merge branch 'dev_hjq' into szzh
|
2015-06-05 17:17:56 +08:00 |
|
sw
|
360c08bb8b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-05 17:17:44 +08:00 |
|
huang
|
c85fd9f7b8
|
处理新作业模块的冲突
|
2015-06-05 17:17:35 +08:00 |
|
sw
|
ab7bf9eb01
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-06-05 17:17:20 +08:00 |
|
sw
|
70bea8b90a
|
Merge branch 'szzh' into dev_hjq
|
2015-06-05 17:02:07 +08:00 |
|
sw
|
79893c4917
|
作业提交时，根据验证结果相应空间focus
|
2015-06-05 16:57:09 +08:00 |
|
yutao
|
b4732814e6
|
...
|
2015-06-05 16:20:26 +08:00 |
|
huang
|
c62d468ed3
|
修改项目新闻和课程通知冲突
|
2015-06-05 15:54:56 +08:00 |
|
huang
|
1f6308b97e
|
Merge branch 'szzh' into dev_hjq
|
2015-06-05 15:36:05 +08:00 |
|
huang
|
59de781b8c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-05 15:35:26 +08:00 |
|
huang
|
bef1917c4e
|
修改异常
|
2015-06-05 15:32:19 +08:00 |
|
sw
|
f675211642
|
学生作品列表，没有真实姓名就显示login，作品附件导出也一样
|
2015-06-05 15:26:35 +08:00 |
|
huang
|
8adb00fccb
|
修改讨论区邮件中样式和编辑不一致问题
|
2015-06-05 15:26:14 +08:00 |
|
huang
|
a148c49fa9
|
邮件给出激活账号提示
|
2015-06-05 15:02:22 +08:00 |
|
huang
|
54abe5d858
|
没有等待加入的成员则不显示
|
2015-06-05 14:51:36 +08:00 |