 alan
|
87fdecdabd
|
创新竞赛添加删除功能
|
2014-04-21 18:13:57 +08:00 |
yanxd
|
b4209b7cc5
|
jrating
|
2014-04-21 15:41:51 +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
|
a4ab29f49d
|
footer logo modify
|
2014-04-19 11:04:44 +08:00 |
 wanglinchun
|
3d02cb7ce0
|
修改首页显示部分数据
|
2014-04-19 10:56:18 +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
|
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
|
5699a947ec
|
建立了学校与用户的关联
课程与用户的学校字段均为学校id而不再是学校名称
页面暂时改了想到的地方= =
|
2014-04-17 17:36:41 +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
|
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
|
28ffd44e55
|
调整竞赛页面加入竞赛，关注以及配置竞赛的显示样式
|
2014-04-16 21:16:51 +08:00 |
|
wanglinchun
|
945ca3787a
|
调整个人主页中top-menu跳转菜单：增加跳转到竞赛模块首页
|
2014-04-16 09:52:36 +08:00 |
|
wanglinchun
|
6421f02ac8
|
调整了参赛应用列表布局显示样式
|
2014-04-16 08:46:04 +08:00 |
|
wanglinchun
|
b4b61a3422
|
修改小bug；设计打分和评论唯一性前提交版
|
2014-04-14 21:54:54 +08:00 |
|
wanglinchun
|
733497fef8
|
调整竞赛列表页面中部分统计数字的超链接
|
2014-04-14 17:29:38 +08:00 |
|
wanglinchun
|
f9e5dd47f6
|
修改了竞赛列表的排序问题
|
2014-04-11 21:56:35 +08:00 |
|
yanxd
|
28a5eff048
|
topics未登录footer飞出去的问题，擦屁股+10086,dom结构还有错，找不到崩溃
|
2014-04-11 16:44:02 +08:00 |
 nieguanghui
|
6baa87a8ea
|
修复项目列表分数显示不一致的问题，修改用户列表显示不一致的问题，修改作业中项目显示分数和项目内部分数不一致的问题
|
2014-04-11 10:53:51 +08:00 |
|
yanxd
|
ac4e74af91
|
作业layout显示提交作业的类型
|
2014-04-10 09:34:09 +08:00 |
|
xianbo
|
20bf1dadc0
|
fix
|
2014-04-09 15:43:20 +08:00 |
|
xianbo
|
b2896c1645
|
fix
|
2014-04-09 11:27:12 +08:00 |
|
yanxd
|
1b6cdeac05
|
列表上提交作业，大概好了吧
|
2014-04-09 11:06:13 +08:00 |
|
yanxd
|
3fad5abb5c
|
modal init
|
2014-04-08 16:56:53 +08:00 |
|
xianbo
|
2a72f7aac8
|
evils fix
|
2014-04-04 15:25:21 +08:00 |
|
wanglinchun
|
c86af5f483
|
与show_application相关的所有内容改为show_softapplication，以防和系统中的application冲突
|
2014-04-04 11:17:50 +08:00 |
|
wanglinchun
|
2a278e0a2d
|
all
|
2014-04-03 22:38:18 +08:00 |
|
xianbo
|
6888e2bf01
|
fix
|
2014-04-02 10:59:32 +08:00 |
|
xianbo
|
90dcf36257
|
left italic in email
|
2014-04-02 10:47:50 +08:00 |
|
xianbo
|
02925fbb99
|
fix
|
2014-04-02 08:27:39 +08:00 |
|
xianbo
|
5d77381bb9
|
fix the user.trustie.net
|
2014-04-01 16:40:55 +08:00 |
|
xianbo
|
5c63ea2378
|
add contest and fix url
|
2014-03-31 10:56:29 +08:00 |
|
xianbo
|
2bba27e7a1
|
evils uri
|
2014-03-31 09:01:27 +08:00 |
|
yanxd
|
f7eca26770
|
资源库位置调整：排第三
|
2014-03-30 15:46:58 +08:00 |
|
xianbo
|
6e065361b3
|
fix main page navigation
|
2014-03-29 11:03:04 +08:00 |
|
yanxd
|
3097f23c06
|
shang
|
2014-03-27 17:12:35 +08:00 |
|
xianbo
|
34fd8a933a
|
fix the show of domain and project page
|
2014-03-21 20:26:28 +08:00 |
|
xianbo
|
20cd5941a8
|
modify project main page
|
2014-03-21 15:17:14 +08:00 |
|
xianbo
|
3f55e78f49
|
add diff url in navigation
|
2014-03-20 10:10:22 +08:00 |
|
yanxd
|
d9bc17c1ea
|
留言权限， basecourse关闭课程重构
|
2014-03-19 17:32:32 +08:00 |
|
yanxd
|
e0c87996bf
|
改了个课程截至日期，并且在courses_controller中设置了过期不允许加入的设定，目测没什么问题，明天再看看
|
2014-03-17 22:43:38 +08:00 |
|
yanxd
|
daed8a1164
|
暂且提交，增加活动失败。
|
2014-03-13 22:06:49 +08:00 |