 huang
|
3962b20f25
|
Merge branch 'szzh' into dev_hjq
|
2015-06-26 10:09:37 +08:00 |
|
huang
|
9b8475db30
|
Merge branch 'dev_hjq' into szzh
|
2015-06-26 10:06:31 +08:00 |
|
huang
|
e88d71db57
|
Merge branch 'szzh' into dev_hjq
|
2015-06-26 10:05:41 +08:00 |
|
huang
|
5d0cd4520e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-26 10:04:48 +08:00 |
|
huang
|
cd43a906b9
|
Merge branch 'dev_hjq' into szzh
|
2015-06-26 10:03:42 +08:00 |
|
huang
|
cf0e1b3bd5
|
修改缺陷：上传名称较长的资源，文字被截断了
|
2015-06-26 09:47:58 +08:00 |
 yutao
|
e6a15a45c4
|
bug#2782:讨论区：若某一级回帖是视频，再二级回复该回复信息，显示时超出边框
|
2015-06-26 09:42:17 +08:00 |
 lizanle
|
a8377f7dcb
|
讨论区模型
|
2015-06-26 09:19:23 +08:00 |
|
lizanle
|
2ba87477fa
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-06-26 09:18:39 +08:00 |
|
lizanle
|
e5082ff489
|
新版课程动态 课程作业展示
|
2015-06-26 09:18:12 +08:00 |
|
yutao
|
ffd254b7bb
|
bug#2920:课程通知：对课程通知进行评论时，不输入字符，点击ENTER键也可以保存评论
|
2015-06-26 09:16:37 +08:00 |
|
huang
|
4092077923
|
不同课程邮件多条记录按desc排序
|
2015-06-25 16:34:02 +08:00 |
|
yutao
|
046a593f42
|
编辑器有用户有这种输入:<p 后面没有>
加个<!-- -->先将就下
|
2015-06-25 14:51:29 +08:00 |
|
huang
|
3924bdf338
|
添加编辑缺陷查看差别功能
|
2015-06-25 14:28:44 +08:00 |
 sw
|
e4011adf16
|
Merge branch 'develop' into szzh
|
2015-06-25 14:25:35 +08:00 |
|
huang
|
777e3f6fad
|
1、解决非项目成员访问公开项目403问题
2、去掉以前无用代码，解决对应调用问题
|
2015-06-25 10:11:01 +08:00 |
|
sw
|
e6f3b9ed8f
|
Merge branch 'guange_dev' into develop
Conflicts:
public/javascripts/application.js
|
2015-06-24 16:27:07 +08:00 |
 guange
|
38b97aa558
|
下载url有两处需要处理的
|
2015-06-24 16:23:15 +08:00 |
|
sw
|
251c08e431
|
作业打包作业名带+号无法下载
|
2015-06-24 16:15:44 +08:00 |
|
yutao
|
c92bd138bb
|
bug#2915:正式版—项目讨论区：发布内容过多且带有表情时，显示不完整，也没有展开提示。
|
2015-06-24 16:12:45 +08:00 |
|
guange
|
02fa9dc492
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-06-24 16:08:36 +08:00 |
|
guange
|
81187dea36
|
有带+号的作业无法打包下载的问题
|
2015-06-24 16:07:54 +08:00 |
|
sw
|
6a6ed841ad
|
Merge branch 'guange_dev' into develop
|
2015-06-24 16:07:29 +08:00 |
|
yutao
|
be9cf478e5
|
bug#2911:用超级管理员进入admin配置窗口，点击进入“用户列表”，搜索某用户，点击该用户，如图，用户动态中字被截断了
|
2015-06-24 15:39:16 +08:00 |
|
huang
|
5b2202de75
|
处理配置文件冲突
|
2015-06-24 09:41:33 +08:00 |
|
huang
|
f65f2dc926
|
课程通知、回复、发布缺陷、回复合二为一
|
2015-06-24 09:31:52 +08:00 |
|
yutao
|
8ebfe57fe0
|
bug#2901:课程讨论区：从个人主页到了如下页面，但从课程论坛就再也进不到这个页面了
MessagesController#show跳转到BoardsController#index
|
2015-06-23 16:05:08 +08:00 |
|
huang
|
5d1b157cd7
|
更新邮件（特殊情况）：缺陷留言为空，只更新状态
|
2015-06-23 15:49:39 +08:00 |
|
sw
|
a9ff9f96bd
|
作品列表为空时缺评列表报错
|
2015-06-19 16:23:28 +08:00 |
|
sw
|
95ab6dd6c0
|
未开启匿评作业不可查看缺评情况
|
2015-06-19 16:20:18 +08:00 |
|
sw
|
5d9c730fd1
|
未开启匿评作业不现实缺评列表
|
2015-06-19 16:17:29 +08:00 |
|
sw
|
cc8e08ded5
|
Merge branch 'szzh' into develop
|
2015-06-19 16:11:24 +08:00 |
|
sw
|
358c344ca5
|
迁移文件错误
|
2015-06-19 16:10:49 +08:00 |
|
huang
|
2e10144dd4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-19 15:59:02 +08:00 |
|
huang
|
a2e84de88f
|
解决issue为空情况
|
2015-06-19 15:58:40 +08:00 |
|
sw
|
92d0bce882
|
Merge branch 'szzh' into develop
|
2015-06-19 15:57:14 +08:00 |
|
sw
|
1b0a31f632
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-19 15:53:30 +08:00 |
|
sw
|
7ec22e7830
|
结束当天提交的作品不是迟交
|
2015-06-19 15:51:26 +08:00 |
|
huang
|
1fc976c3e0
|
Merge branch 'dev_hjq' into szzh
|
2015-06-19 15:49:04 +08:00 |
|
huang
|
a05b8d1f39
|
Merge branch 'szzh' into dev_hjq
|
2015-06-19 15:48:04 +08:00 |
|
huang
|
a7a7c57f6a
|
解决回复为空的情况不显示问题
|
2015-06-19 15:46:49 +08:00 |
|
lizanle
|
d73a2c1003
|
课程动态新版api
|
2015-06-19 15:05:25 +08:00 |
|
sw
|
2f07d629c0
|
Merge branch 'guange_dev' into szzh
|
2015-06-19 15:04:49 +08:00 |
|
sw
|
a72bbee503
|
按名字排序没有过滤搜索条件
|
2015-06-19 14:59:28 +08:00 |
|
guange
|
e1cf19baac
|
打开课程缓存
|
2015-06-19 14:51:39 +08:00 |
|
sw
|
86dc66ebeb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-19 14:50:59 +08:00 |
|
sw
|
881854a2f0
|
姓名排序
|
2015-06-19 14:50:46 +08:00 |
|
guange
|
2f6ede2bd5
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-06-19 14:49:34 +08:00 |
|
guange
|
489f62edb7
|
删除帖子也要更新动态
|
2015-06-19 14:49:18 +08:00 |
|
sw
|
44a49af68b
|
时间排序
|
2015-06-19 14:30:43 +08:00 |