 sw
|
be08a9afbb
|
修改application.css中错误css
|
2015-04-15 11:42:23 +08:00 |
|
sw
|
9079eaa4f9
|
Merge branch 'szzh' into develop
|
2015-04-15 11:28:02 +08:00 |
|
sw
|
a093346822
|
Merge branch 'guange_dev' into szzh
|
2015-04-15 11:27:13 +08:00 |
|
sw
|
2b1990a5b7
|
Merge branch 'develop' into guange_dev
|
2015-04-15 11:26:07 +08:00 |
 guange
|
11c1bbb525
|
解决打包时文件过多插库错误
|
2015-04-15 11:24:15 +08:00 |
 lizanle
|
b13d30bf20
|
自动更改
|
2015-04-15 10:52:50 +08:00 |
|
lizanle
|
c42a63ea4e
|
添加判空
|
2015-04-15 10:52:10 +08:00 |
|
lizanle
|
c2ccf6a1f8
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-15 10:31:09 +08:00 |
|
lizanle
|
a7f1026828
|
current_user判空
|
2015-04-15 10:30:56 +08:00 |
|
sw
|
a362ace9eb
|
Merge branch 'szzh' into develop
|
2015-04-15 10:29:49 +08:00 |
|
sw
|
7dbd20e5eb
|
修复刷新页面时只评论未评分表的作品在已评列表中
|
2015-04-15 10:27:17 +08:00 |
|
sw
|
ed5911eab5
|
Merge branch 'develop' into szzh
|
2015-04-15 10:22:10 +08:00 |
|
sw
|
61df6e144d
|
修复学生作业列表QQ浏览器显示超出边框
|
2015-04-15 10:06:52 +08:00 |
|
sw
|
d1f42a3954
|
教师只评论不评分的作品在未批和已批列表中都有
|
2015-04-15 09:52:33 +08:00 |
|
sw
|
78dff36d7a
|
老师只评论不评分的学生作业却在已评列表
|
2015-04-15 09:06:54 +08:00 |
|
sw
|
63375e7bcb
|
Merge branch 'szzh' into develop
|
2015-04-15 08:51:16 +08:00 |
|
sw
|
ee68828132
|
创建课程后跳转URL报错
|
2015-04-15 08:50:29 +08:00 |
|
sw
|
81cbb76d78
|
课程/项目--添加成员：用真实姓名搜索用户时，需要在姓和名之间加个空格才可以搜到
|
2015-04-14 19:50:17 +08:00 |
|
sw
|
c60515ac50
|
学生作业增加按学生真实姓名、昵称、学号搜索功能
|
2015-04-14 19:24:39 +08:00 |
|
sw
|
bb9513b313
|
课程学生作业列表增加搜索的静态页面
|
2015-04-14 16:36:03 +08:00 |
|
sw
|
1598bf6b4d
|
课程成员搜索忽略大小写
|
2015-04-14 15:16:58 +08:00 |
|
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 |