 sw
|
ead0ffb2f4
|
Merge branch 'develop' into szzh
|
2015-04-14 10:50:30 +08:00 |
 guange
|
eb4d9a4ffc
|
1. 将session改为跨子域。 2. 将session的存储改到files/cache_store下，用于nfs
|
2015-04-13 20:44:46 +08:00 |
whimlex
|
a65a2ab090
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-13 18:35:03 +08:00 |
|
whimlex
|
cf4451e998
|
pre标签换行；contest主页样式调整
|
2015-04-13 18:34:44 +08:00 |
|
sw
|
a0f01469a0
|
Merge branch 'develop' into szzh
|
2015-04-13 10:56:49 +08:00 |
|
sw
|
cd7d425320
|
Merge branch 'szzh' into develop
|
2015-04-12 14:48:39 +08:00 |
|
sw
|
19edc8f586
|
1、忽略logo文件夹
2、忽略editor上传图片文件夹
|
2015-04-12 14:24:09 +08:00 |
 lizanle
|
76d7bd267c
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-11 15:54:12 +08:00 |
|
lizanle
|
68a54b9368
|
app评论
|
2015-04-11 15:52:48 +08:00 |
|
sw
|
7b60998952
|
修改点击课程名称，url连接错误
|
2015-04-11 15:34:08 +08:00 |
|
sw
|
c623f7ba8d
|
Merge branch 'szzh' into develop
|
2015-04-11 15:14:18 +08:00 |
|
sw
|
b3d6ab6d80
|
Merge branch 'guange_dev' into szzh
|
2015-04-11 15:13:31 +08:00 |
|
sw
|
6c32e073ed
|
Merge branch 'szzh' into develop
|
2015-04-11 14:58:01 +08:00 |
|
sw
|
44cb4a8e56
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-11 14:57:15 +08:00 |
|
guange
|
af6db916d9
|
将files文件夹忽略
|
2015-04-11 14:49:44 +08:00 |
|
whimlex
|
ccff6c27b0
|
#2170项目--新闻：评论新闻返回异常undefined method `split' for nil:NilClass
|
2015-04-11 14:14:47 +08:00 |
|
whimlex
|
f79132e9be
|
项目新闻评论不显示无评论的查看
|
2015-04-11 14:01:51 +08:00 |
|
whimlex
|
7e46885f3d
|
修改上传附件数目限制
|
2015-04-11 13:46:49 +08:00 |
|
whimlex
|
5936d8d8e9
|
评论显示
|
2015-04-11 11:52:11 +08:00 |
|
whimlex
|
23a6408c9f
|
评论数为0时不显示“查看所有评论”
|
2015-04-11 11:19:24 +08:00 |
|
sw
|
8d565a1165
|
Merge branch 'szzh' into develop
|
2015-04-11 11:16:52 +08:00 |
|
sw
|
fe9f277620
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-11 11:16:08 +08:00 |
|
sw
|
1c19114252
|
去掉发布竞赛的权限判断
|
2015-04-11 11:15:15 +08:00 |
|
whimlex
|
38391b7e96
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-11 11:03:53 +08:00 |
|
whimlex
|
6ff1a7d692
|
问题顶和踩国际化
|
2015-04-11 11:03:36 +08:00 |
|
sw
|
2923cd16a1
|
Merge branch 'guange_dev' into szzh
|
2015-04-11 11:01:20 +08:00 |
|
guange
|
8454e56ff4
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-04-11 10:16:02 +08:00 |
|
guange
|
123fa079b3
|
smtp配置放入production
|
2015-04-11 10:15:43 +08:00 |
|
whimlex
|
0427032cbe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-10 17:59:27 +08:00 |
|
whimlex
|
874dcc2b89
|
附件上传国际化调整
|
2015-04-10 17:58:59 +08:00 |
|
sw
|
434415343c
|
课程留言图片显示问题
|
2015-04-10 17:36:21 +08:00 |
|
sw
|
b2b3aeb20b
|
课程讨论区评论图片问题
|
2015-04-10 17:18:52 +08:00 |
|
sw
|
5bcb6261af
|
Merge branch 'szzh' into develop
|
2015-04-10 17:01:45 +08:00 |
|
whimlex
|
e148917865
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-10 17:00:10 +08:00 |
|
whimlex
|
69153d2d95
|
项目界面缺失翻译调整
|
2015-04-10 16:59:45 +08:00 |
|
lizanle
|
e595f1d445
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-10 16:43:48 +08:00 |
|
lizanle
|
b3b0461a42
|
已经被关注的人就不显示
|
2015-04-10 16:43:42 +08:00 |
|
sw
|
fbe12ca6c3
|
Merge branch 'guange_dev' into szzh
|
2015-04-10 16:40:01 +08:00 |
|
sw
|
858a54267f
|
Merge branch 'szzh' into guange_dev
|
2015-04-10 16:39:24 +08:00 |
|
sw
|
ece4a67f97
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-10 16:35:20 +08:00 |
|
sw
|
d99910e8a1
|
个人动态列表留言动态url错误
|
2015-04-10 16:34:57 +08:00 |
|
guange
|
a344fcdfc7
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-04-10 16:27:56 +08:00 |
|
guange
|
f94184bc81
|
个人动态权限部分性能优化
|
2015-04-10 16:27:26 +08:00 |
|
sw
|
f0ba408a10
|
课程通知、个人动态 大图片超出页面
|
2015-04-10 16:14:19 +08:00 |
|
sw
|
600003e48c
|
公共贴吧中使用新编辑器上传大图片，图片超出界面
|
2015-04-10 15:54:17 +08:00 |
|
sw
|
400d1a147d
|
课程新编辑器导致图片超出页面
|
2015-04-10 15:43:37 +08:00 |
|
sw
|
ea0bd7e0dd
|
1、技术支持只有白羽
2、修改鼠标悬浮在白羽上有下划线
|
2015-04-10 15:22:03 +08:00 |
|
sw
|
172e69a552
|
1、课程导航懒点击课程跳到动态页面
2、右上角课程下拉条增宽
3、课程通知 截至时间-->创建时间
|
2015-04-10 15:16:11 +08:00 |
|
sw
|
0c949b7117
|
1、课程导航懒点击课程跳到动态页面
2、右上角课程下拉条增宽
3、课程通知 截至时间-->创建时间
|
2015-04-10 15:16:02 +08:00 |
|
sw
|
596bc213ca
|
1、课程导航懒点击课程跳到动态页面
2、右上角课程下拉条增宽
3、课程通知 截至时间-->创建时间
|
2015-04-10 15:15:49 +08:00 |