 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 |
|
sw
|
412efb28fe
|
点击作业，新打开一个tab页
|
2015-06-05 14:39:37 +08:00 |
|
sw
|
bcf2e7691d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-05 14:34:21 +08:00 |
|
sw
|
f7b3229065
|
当作品中没有附件时，下载报错
|
2015-06-05 14:33:22 +08:00 |
|
huang
|
a967a86a1d
|
修改邮件500缺陷
|
2015-06-05 14:24:50 +08:00 |
|
yutao
|
64251f1093
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-05 14:16:41 +08:00 |
|
yutao
|
18e41e562a
|
讨论区编辑器加上其他的按钮
|
2015-06-05 14:16:21 +08:00 |
|
sw
|
a881343db5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-05 13:56:45 +08:00 |
|
sw
|
427553d4e5
|
老师编辑作业、学生编辑作品时删除附件界面没刷新
|
2015-06-05 13:56:13 +08:00 |
|
yutao
|
2e7c6c4afb
|
修复bug#2725 :用户搜索--默认用户名和姓名一起匹配
|
2015-06-05 11:39:55 +08:00 |
|
sw
|
f466084a17
|
地区没有就不显示了
|
2015-06-05 11:22:38 +08:00 |
|
sw
|
8b0eb21d08
|
关注需求功能取消，部分用户进入个人主页报错
|
2015-06-05 11:17:00 +08:00 |
|
sw
|
9d1100a9df
|
项目内资源选人我的项目关闭按钮
|
2015-06-05 10:50:43 +08:00 |
|
sw
|
c31e370ad6
|
课程资源列表：选人我的课程、选入我的其他课程弹出框关闭按钮异常
|
2015-06-05 10:37:24 +08:00 |
|
yutao
|
a456616212
|
...
|
2015-06-05 10:33:42 +08:00 |
|
sw
|
bf653fa94f
|
课程作品列表搜索功能异常
|
2015-06-05 10:31:51 +08:00 |
|
sw
|
7bab135ac7
|
1、上传资源时公开单选框样式
2、课程上传资源文件有下拉条
|
2015-06-05 10:25:58 +08:00 |
|
yutao
|
8fcf7ac7a8
|
...
|
2015-06-05 10:25:42 +08:00 |
|
yutao
|
d9dd744fb1
|
...
|
2015-06-05 10:16:16 +08:00 |
|
yutao
|
4aba7484e5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-05 10:11:18 +08:00 |
|
yutao
|
85682d6bbc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-05 10:10:14 +08:00 |
|
sw
|
523dc9b343
|
项目讨论区、发帖回帖报错
|
2015-06-05 10:06:30 +08:00 |
|
sw
|
59c4e04e37
|
删除bid相关路由
|
2015-06-05 09:57:33 +08:00 |
|
sw
|
d2c51f27b6
|
Bid功能已经废弃
|
2015-06-05 09:48:23 +08:00 |
|
sw
|
6378cf3583
|
Merge branch 'develop' into szzh
|
2015-06-05 09:47:09 +08:00 |
|
sw
|
2f2d0a7942
|
bid已经废弃
|
2015-06-05 09:37:56 +08:00 |