 yanxd
|
47e6c3eedd
|
home cache
|
2014-06-16 09:19:21 +08:00 |
|
yanxd
|
63cd19c15c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-16 09:18:48 +08:00 |
 z9hang
|
b727d023b6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-13 16:58:49 +08:00 |
|
yanxd
|
955fece267
|
merge develop
|
2014-06-13 16:52:12 +08:00 |
|
yanxd
|
b356145d71
|
course logo
|
2014-06-13 16:46:57 +08:00 |
|
yanxd
|
3fd7104448
|
welcome index obj.includes, routes add school logo
|
2014-06-13 16:37:38 +08:00 |
|
yanxd
|
07e4d40d44
|
cache obj
|
2014-06-13 16:13:32 +08:00 |
|
z9hang
|
eae3918074
|
添加用户得数统计功能
帖子内的踩顶横排
|
2014-06-13 16:09:43 +08:00 |
|
yanxd
|
93d13c8867
|
system bin, 坑
|
2014-06-13 15:42:59 +08:00 |
|
yanxd
|
7456e37e8a
|
home
|
2014-06-13 12:04:15 +08:00 |
|
yanxd
|
eff2da732b
|
home
|
2014-06-13 12:02:29 +08:00 |
|
yanxd
|
ceef85719e
|
contest fix
|
2014-06-13 11:49:11 +08:00 |
|
yanxd
|
70abac4c1e
|
Merge branch 'competition' into develop
Conflicts:
app/controllers/application_controller.rb
config/locales/en.yml
config/locales/zh.yml
db/schema.rb
|
2014-06-13 10:59:43 +08:00 |
|
yanxd
|
362570e34b
|
contestnotification_edit function
|
2014-06-13 09:38:51 +08:00 |
|
z9hang
|
621346268f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-13 08:37:11 +08:00 |
|
yanxd
|
b58c5685ac
|
Merge branch 'szzh' into develop
|
2014-06-13 08:36:24 +08:00 |
|
yanxd
|
f8bfa83ae4
|
move cache
|
2014-06-13 08:35:37 +08:00 |
|
z9hang
|
e8d561b4ba
|
修正贴吧顶踩加分无效问题
|
2014-06-12 17:39:44 +08:00 |
 wanglinchun
|
8618b73a8c
|
本次安卓校园竞赛获奖结果更新，首页正常显示
|
2014-06-12 16:58:01 +08:00 |
|
z9hang
|
f7fc4d06a2
|
添加贴吧帖子顶踩功能
|
2014-06-12 16:46:54 +08:00 |
 sw
|
b7458abd9e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-12 16:43:34 +08:00 |
|
sw
|
277aa81a60
|
修复占位列表界面显示的作业描述样式不正确的问题
|
2014-06-12 16:43:02 +08:00 |
|
z9hang
|
4fb96bacdc
|
修正更新用户等级方法，保证每个用户只有一条记录
|
2014-06-12 16:41:48 +08:00 |
|
yanxd
|
0536af6625
|
Merge branch 'szzh' into develop
|
2014-06-12 16:39:35 +08:00 |
|
z9hang
|
a42c79cea2
|
添加用户升级功能（用户达到一定条件时自动升级，未在前端体现）
|
2014-06-12 16:35:59 +08:00 |
|
yanxd
|
858a7936b5
|
revert userscore catch exception, added cache to footer.
|
2014-06-12 16:19:46 +08:00 |
|
sw
|
8075645591
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-12 15:48:58 +08:00 |
|
yanxd
|
cccb19e733
|
cnzz
|
2014-06-12 15:46:16 +08:00 |
|
sw
|
9bd8132359
|
修复作业无法留言、无法综评的BUG
|
2014-06-12 15:42:58 +08:00 |
|
wanglinchun
|
52e7be1b1d
|
修改首页中评奖结果的显示字体
|
2014-06-12 15:37:45 +08:00 |
|
sw
|
f4961cbc50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-12 15:27:17 +08:00 |
|
sw
|
a100193373
|
1.作业参与人员可以对作业进行修改，但不能进行删除
2.作业成员(发布人员和参与人员)不能对作业进行评分
3.修改进行作业删除、添加、修改、添加成员等方法的权限判断
|
2014-06-12 15:25:59 +08:00 |
|
yanxd
|
efdbf3e808
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-12 15:20:22 +08:00 |
|
yanxd
|
09edfc7c0c
|
cache test
|
2014-06-12 15:20:14 +08:00 |
|
z9hang
|
5a47c52d23
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-12 15:13:05 +08:00 |
|
z9hang
|
ebbd4b0642
|
课程讨论区踩顶帖子
会员等级计算（占位实现自动升级）
技术得分计算
|
2014-06-12 15:12:55 +08:00 |
|
sw
|
8ed95f132a
|
1.修改、新建占位页面增加导航栏
2.作业的作者不能对作业进行评分
|
2014-06-12 15:05:39 +08:00 |
|
sw
|
025b8971e6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-12 14:44:13 +08:00 |
|
sw
|
d832a5eecf
|
rake db:migrate
|
2014-06-12 14:43:51 +08:00 |
|
wanglinchun
|
15c88df72d
|
为发布竞赛通知添加权限
|
2014-06-12 11:17:09 +08:00 |
|
wanglinchun
|
d76eec27cc
|
为竞赛通知评论添加登录权限
|
2014-06-12 11:11:12 +08:00 |
|
wanglinchun
|
60bdff86a1
|
竞赛通知增加权限限制
|
2014-06-12 10:59:05 +08:00 |
|
yanxd
|
e4ed8cf970
|
分数显示整数
|
2014-06-12 10:52:22 +08:00 |
|
wanglinchun
|
bb06ee921a
|
sdf
|
2014-06-12 09:35:34 +08:00 |
|
z9hang
|
a8670ba6fc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-12 08:47:40 +08:00 |
|
z9hang
|
e606fd89d2
|
被关注+2分、取消关注-2分
讨论区帖子加顶踩功能
顶踩帖子加减分接口
|
2014-06-11 17:41:47 +08:00 |
|
sw
|
29fa624e9d
|
封装获取作业成员的方法
|
2014-06-11 17:41:06 +08:00 |
|
sw
|
19fc84afee
|
作业增加成员、删除成员增加权限控制
|
2014-06-11 17:34:57 +08:00 |
|
sw
|
43736ba8d6
|
兼容历史数据
|
2014-06-11 17:00:23 +08:00 |
|
sw
|
541ced18ec
|
作业显示界面增加导航栏
|
2014-06-11 16:53:07 +08:00 |