 kg
|
fb33fa5430
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develo
gcm test
Conflicts:
app/views/boards/show.html.erb
|
2014-04-19 10:02:26 +08:00 |
|
kg
|
e333c748b7
|
boards footer
|
2014-04-19 09:53:09 +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 |
|
alan
|
9206a30bd4
|
将提交和返回按钮放到文件上传的框内
|
2014-04-17 14:49:51 +08:00 |
|
alan
|
f6a1e90ad1
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-17 14:48:35 +08:00 |
|
kg
|
4d727d8049
|
revert the mistaken move:base_courses and base_project footer
|
2014-04-17 09:03:39 +08:00 |
|
kg
|
d450da9df8
|
footer , footer of base_course,upload files count and delete all upload
|
2014-04-17 08:33:44 +08:00 |
|
kg
|
c9b92b4197
|
modify status color
|
2014-04-16 22:15:34 +08:00 |
|
kg
|
3013930f28
|
modify footer
|
2014-04-16 22:15:33 +08:00 |
|
kg
|
3f096f9167
|
add pdl logo
|
2014-04-16 22:15:32 +08:00 |
|
kg
|
69dbd5a85e
|
add logos and modify footer;footer position problem of some projects and courses
|
2014-04-16 22:15:31 +08:00 |
|
kg
|
2cec3b0490
|
modify footer
|
2014-04-16 22:15:30 +08:00 |
|
wanglinchun
|
a52e057d94
|
修改添加应用不能刷新的问题
|
2014-04-16 21:44:52 +08:00 |
|
wanglinchun
|
7adb1f8a60
|
添加侧面短线
|
2014-04-16 21:23:04 +08:00 |
|
wanglinchun
|
28ffd44e55
|
调整竞赛页面加入竞赛，关注以及配置竞赛的显示样式
|
2014-04-16 21:16:51 +08:00 |
|
wanglinchun
|
1a6a20e761
|
竞赛模块首页布局和显示效果调整好
|
2014-04-16 20:23:38 +08:00 |
|
wanglinchun
|
3a5b5bc0ce
|
设计并调整竞赛模块的首页显示样式
|
2014-04-16 17:32:58 +08:00 |
|
yanxd
|
61c285ff10
|
page access controll with homework.zip
|
2014-04-16 15:17:55 +08:00 |
|
yanxd
|
d137e78f19
|
remove tmp file rake task/
|
2014-04-16 15:11:27 +08:00 |
|
yanxd
|
cabceb0064
|
test zip down
|
2014-04-16 14:44:26 +08:00 |
|
yanxd
|
84d3e40c41
|
zip down controller created
|
2014-04-16 11:27:08 +08:00 |
|
Wen
|
d43bf49f4c
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-16 10:58:10 +08:00 |
|
Wen
|
56eefe42eb
|
项目作业处迟交标记添加
迟交判断更改了一下- -
|
2014-04-16 10:58:03 +08:00 |
|
yanxd
|
6f5fcd0dee
|
测试作业下载
|
2014-04-16 10:44:06 +08:00 |
|
Wen
|
9fd7f11a47
|
附件形式提交的作业处，迟交标记添加
|
2014-04-16 10:35:01 +08:00 |
|
wanglinchun
|
945ca3787a
|
调整个人主页中top-menu跳转菜单：增加跳转到竞赛模块首页
|
2014-04-16 09:52:36 +08:00 |
|
Wen
|
30a70bba74
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-16 09:07:42 +08:00 |
|
yanxd
|
53d07645a2
|
gem reset
|
2014-04-16 09:08:24 +08:00 |
|
wanglinchun
|
6421f02ac8
|
调整了参赛应用列表布局显示样式
|
2014-04-16 08:46:04 +08:00 |
|
Wen
|
f1bbee7e35
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-16 08:37:25 +08:00 |
|
yanxd
|
28bebb1ee7
|
add Gem
zip
root path firefox bug
|
2014-04-15 21:15:10 +08:00 |