xianbo
|
4de9f959ac
|
clean repository
|
2014-04-21 20:14:58 +08:00 |
yanxd
|
6e4944b914
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-21 20:08:11 +08:00 |
|
yanxd
|
e5a5a337b2
|
format code
|
2014-04-21 20:07:43 +08:00 |
 wanglinchun
|
66c4d870a4
|
评分样式
|
2014-04-21 20:07:30 +08:00 |
|
yanxd
|
0226052dd0
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-21 20:01:00 +08:00 |
|
yanxd
|
2b679b1ef9
|
看图不登录
|
2014-04-21 20:00:50 +08:00 |
|
wanglinchun
|
8a429ec669
|
首页提示语
|
2014-04-21 19:40:04 +08:00 |
|
wanglinchun
|
94a7bacdd2
|
首页：当无应用时，提示暂无应用
|
2014-04-21 19:40:03 +08:00 |
 alan
|
87fdecdabd
|
创新竞赛添加删除功能
|
2014-04-21 18:13:57 +08:00 |
|
yanxd
|
4c3955bca0
|
revert create tmp
This reverts commit 6bfcf094d9.
|
2014-04-21 16:53:13 +08:00 |
|
yanxd
|
6bfcf094d9
|
f**k
|
2014-04-21 16:21:39 +08:00 |
|
yanxd
|
daf7e8d200
|
user added rater
|
2014-04-21 16:03:55 +08:00 |
|
yanxd
|
e802424e2a
|
merge jrating
|
2014-04-21 15:43:00 +08:00 |
|
yanxd
|
b4209b7cc5
|
jrating
|
2014-04-21 15:41:51 +08:00 |
|
xianbo
|
1aae4291a5
|
fix gitignore
|
2014-04-21 14:15:57 +08:00 |
|
xianbo
|
0a5de653d0
|
fix db migrate
|
2014-04-21 14:07:54 +08:00 |
 baiyu
|
f0b497e455
|
user score merge
|
2014-04-21 11:15:41 +08:00 |
|
baiyu
|
36cd91401f
|
user score
|
2014-04-21 11:13:45 +08:00 |
|
alan
|
dd09c36a8f
|
Added the message of creating the project in the project's activities
|
2014-04-21 09:32:55 +08:00 |
|
alan
|
9a580655ab
|
在project的项目动态的最后一页显示项目创建信息
|
2014-04-21 09:22:46 +08:00 |
|
xianbo
|
0d055fd807
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-21 08:55:11 +08:00 |
|
xianbo
|
bb4d141b0e
|
erge branch 'competition' into develop
Conflicts:
app/views/layouts/base_newcontest.html.erb
|
2014-04-21 08:46:08 +08:00 |
|
yanxd
|
9034dd09e7
|
开启重启课程在课程列表里
|
2014-04-21 08:39:49 +08:00 |
|
wanglinchun
|
edb5dac785
|
添加竞赛列表页面中的超链接
|
2014-04-19 14:19:21 +08:00 |
|
wanglinchun
|
43064c4bc2
|
调整竞赛模块首页中显示的竞赛：既有旧的竞赛又有新的竞赛
|
2014-04-19 13:10:25 +08:00 |
|
yanxd
|
8775eab3dd
|
iscas modify
|
2014-04-19 12:47:59 +08:00 |
|
yanxd
|
83f039a014
|
modify pku.png
|
2014-04-19 11:22:33 +08:00 |
|
yanxd
|
a4ab29f49d
|
footer logo modify
|
2014-04-19 11:04:44 +08:00 |
|
wanglinchun
|
3d02cb7ce0
|
修改首页显示部分数据
|
2014-04-19 10:56:18 +08:00 |
|
xianbo
|
2c7615b545
|
fix robots rule
|
2014-04-19 10:04:55 +08:00 |
|
yanxd
|
369c015097
|
board show
|
2014-04-19 09:42:48 +08:00 |
|
yanxd
|
bbf4f25a02
|
idea/:
|
2014-04-19 09:16:23 +08:00 |
|
yanxd
|
7efaa8aba3
|
gitignore idea
|
2014-04-19 09:13:08 +08:00 |
|
wanglinchun
|
982ff342fd
|
显示竞赛页面参赛项目菜单
|
2014-04-18 22:18:04 +08:00 |
|
xianbo
|
647081539c
|
fix
|
2014-04-18 19:50:42 +08:00 |
 kg
|
158c950b78
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-18 17:57:58 +08:00 |
|
kg
|
bdefa322cc
|
modify foot
|
2014-04-18 17:57:11 +08:00 |
|
wanglinchun
|
25bbf791f9
|
dsfsd
|
2014-04-18 17:53:22 +08:00 |
|
wanglinchun
|
651710929a
|
修改弹出新页面
|
2014-04-18 17:04:29 +08:00 |
|
wanglinchun
|
76ccfe8ac4
|
fix
|
2014-04-18 16:35:48 +08:00 |
|
wanglinchun
|
9ac0cbe6a3
|
Merge branch 'competition' into develop
Conflicts:
Gemfile
app/controllers/tags_controller.rb
app/views/layouts/_base_header.html.erb
config/routes.rb
db/schema.rb
|
2014-04-18 16:03:52 +08:00 |
Wen
|
775774ad63
|
临时措施：即使用户没有填写单位，页面也可以正常打开，而不是报错
|
2014-04-18 14:46:32 +08:00 |
|
wanglinchun
|
8f6d9fc6a5
|
0418
|
2014-04-18 10:46:29 +08:00 |
|
wanglinchun
|
e136254c8d
|
回复了项目页面中的头像
|
2014-04-18 09:28:44 +08:00 |
|
Wen
|
4e567afd0a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-18 09:15:18 +08:00 |
|
wanglinchun
|
abef68d13a
|
修改了添加项目时不能自动刷新的问题
|
2014-04-18 09:06:52 +08:00 |
xx
|
f30513217e
|
zip factory
|
2014-04-18 05:18:15 +08:00 |
 yanxd
|
5ee1c8e2f2
|
refactory zip
|
2014-04-17 19:21:50 +08:00 |
|
Wen
|
5699a947ec
|
建立了学校与用户的关联
课程与用户的学校字段均为学校id而不再是学校名称
页面暂时改了想到的地方= =
|
2014-04-17 17:36:41 +08:00 |
|
alan
|
7c8ecd1944
|
项目中添加动态后依然能显示项目创建的动态
|
2014-04-17 16:50:36 +08:00 |