 lizanle
|
ddb705b658
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-06-26 17:16:10 +08:00 |
|
lizanle
|
09b6f1d787
|
修改news api
|
2015-06-26 17:16:03 +08:00 |
 huang
|
fec5378ed3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-26 17:08:05 +08:00 |
|
huang
|
65ee86bb45
|
1，解决git中英文500错误
2.解决编辑器输入样式邮件显示异常问题
|
2015-06-26 17:07:31 +08:00 |
 sw
|
bb9c46a632
|
课程留言回复，回复内容和时间在同一行
|
2015-06-26 16:27:55 +08:00 |
|
sw
|
5a23918304
|
Merge branch 'develop' into szzh
|
2015-06-26 15:20:32 +08:00 |
|
sw
|
19c474e422
|
超级管理员可以查看学生列表、教师列表
|
2015-06-26 15:13:53 +08:00 |
|
sw
|
2598894a59
|
Merge branch 'szzh' into develop
|
2015-06-26 14:47:25 +08:00 |
|
huang
|
801cddecfe
|
Merge branch 'dev_hjq' into szzh
|
2015-06-26 14:46:52 +08:00 |
|
sw
|
3f365ef3b3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-26 14:46:47 +08:00 |
|
sw
|
66eba14dfe
|
课程首页加入课程样式
课程首页 公开资源-->资源
|
2015-06-26 14:46:37 +08:00 |
|
huang
|
284703c386
|
Merge branch 'szzh' into dev_hjq
|
2015-06-26 14:45:42 +08:00 |
|
huang
|
df910a9c2d
|
更改邮件提示语（同步国际化）
|
2015-06-26 14:44:26 +08:00 |
|
sw
|
399fc447f5
|
快速加入项目弹框滚动条
|
2015-06-26 14:31:08 +08:00 |
|
sw
|
0f92a2e3cb
|
下载附件给出使用winrar解压的提示
|
2015-06-26 14:29:03 +08:00 |
|
sw
|
218246239b
|
个人主页图片超出
|
2015-06-26 13:54:39 +08:00 |
|
sw
|
0215d2224e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-26 13:41:33 +08:00 |
|
lizanle
|
c9a614d520
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-06-26 10:22:37 +08:00 |
|
lizanle
|
f32c76c7a2
|
字段名字错误
|
2015-06-26 10:22:30 +08:00 |
 yutao
|
5e29c6bf27
|
bug#2742:项目问题跟踪：新建问题时在描述中直接贴图，若图片长度够长，在个人动态中显示超出边框
|
2015-06-26 10:14:26 +08:00 |
|
huang
|
2cf14bf3e6
|
Merge branch 'dev_hjq' into szzh
|
2015-06-26 10:10:35 +08:00 |
|
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 |
|
sw
|
e1d6891895
|
课程默认logo
|
2015-06-25 16:13:42 +08:00 |
|
sw
|
620fd4230e
|
开启匿评后对已分配到匿评作品的学生的提示
|
2015-06-25 16:06:32 +08:00 |
|
sw
|
ebeeb9cf28
|
开启匿评后学生提交作品提示，开启匿评时对老师的提示
界面css
|
2015-06-25 15:55:57 +08:00 |
|
sw
|
7efe628e73
|
admin可以访问作品列表
|
2015-06-25 14:56:53 +08:00 |
|
sw
|
088854f7df
|
平台用户可访问公开课程的作业列表
|
2015-06-25 14:53:33 +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 |