 alan
|
9e36f9264c
|
修改《竞赛作业评分》
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
b7a89d6108
|
Merge branch 'shaproup' into szzh
Conflicts:
app/models/course.rb
app/models/project.rb
app/views/contests/show_attendingcontest.html.erb
app/views/files/_course_file.html.erb
app/views/files/_course_new.html.erb
app/views/layouts/_base_footer.html.erb
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
 z9hang
|
258967263e
|
1、代码优化。2、很多页面标题不正确问题
|
11 years ago |
 sw
|
e765445279
|
#1298修复竞赛作品简介超出边框的BUG
|
11 years ago |
|
alan
|
5e92e11561
|
修改bug《用户没有登陆随便参加竞赛》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
dea1a299af
|
修改competition的view文件，将其中不规范的代码进行修改，并将其中所有的link_to
修改成"link_to ‘welcome’ home_path, {option}" 的形式；
统一route风格
match 'path', :to => 'controller#action'
如果 path = controller#action 则 match 'path'
Example:
match 'welcome/course', :to => 'welcome#course' 变成 match 'welcome/cource'
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
ShengYue.Xu
|
047f6d2c95
|
修改了缺陷当中 #868、#780、#603
|
11 years ago |
|
sw
|
d66dc65cca
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
bb6be3ed8a
|
修改html错误
|
11 years ago |
|
sw
|
18ddb8604b
|
取消参赛作品名称、描述的字数限制
|
11 years ago |
 nwb
|
79eac39dc2
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
sw
|
c8aaa2776c
|
1.作品类别增加其他选项，当用户选择其他时，显示一编辑框用于用户输入其作品所属类别
2.添加竞赛支持自定义类别
|
11 years ago |
|
nwb
|
2a8929b90f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
z9hang
|
0322258386
|
去掉一个参加竞赛中多出来的项目创建
|
11 years ago |
|
z9hang
|
376ba1d793
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
11 years ago |
|
z9hang
|
5c0e3e96cc
|
修复不分页面导航栏缺失问题、修复部分域名错误问题、添加修复FirstPage表数据的迁移文件
|
11 years ago |
|
nwb
|
4259d9c282
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
sw
|
fdfba199f3
|
修复评奖位置不正确的问题
|
11 years ago |
|
sw
|
71ffdb9164
|
作品分类在下拉列表框中选择
|
11 years ago |
|
nwb
|
f20f0aaa45
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
sw
|
9fe4c9f8a2
|
修改竞赛作品列表显示样式与创建作品样式
|
11 years ago |
|
z9hang
|
74ff5d505d
|
修改加入竞赛创建项目链接域名不正确问题
|
11 years ago |
|
nwb
|
6780167674
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
0e0da39113
|
修改BUG
|
11 years ago |
|
nwb
|
0e9a15aad5
|
短描述修改
|
11 years ago |
|
nwb
|
3b9245d143
|
隐藏新建竞赛作品时的作品类型
|
11 years ago |
 linchun
|
9c5066b81c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
app/controllers/account_controller.rb
|
11 years ago |
|
z9hang
|
d2db58050d
|
修复部分未填工作单位报错问题
|
11 years ago |
|
z9hang
|
08ba10c32d
|
添加超链接
已添加的超链接：
学校主页，课程信息中的学校名称
竞赛中项目列表： 参赛人
竞赛中参入竞赛tab页：参赛代表
修改作业界面教师单位不显示问题，并添加超链接
作业界面作业名称添加超链接
软件众包页面：软件众包名称
软件众包页面：关注栏下头像添加链接，参与项目栏：图片添加链接
贴吧帖子：修复 发帖回帖下方 “由xxx在XXX之前添加”中名子未链接问题
|
11 years ago |
 yanxd
|
579f1d4d31
|
start align-center
|
11 years ago |
|
wanglinchun
|
a1083fe900
|
修改了原有参赛作品显示报500；
修改了作品删除功能报错
|
11 years ago |
|
wanglinchun
|
7b6c96a8b6
|
view中contests中的文件已经全部国际化
|
11 years ago |
xianbo
|
e52886cf46
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/softapplications/show.html.erb
db/schema.rb
|
11 years ago |
|
wanglinchun
|
a22678f36f
|
彻底调好了新建参赛作品后弹出的提示框问题
|
11 years ago |
|
wanglinchun
|
e10c6adf7a
|
隐藏掉新建参赛作品中完成后上传文件小框中出现的提示语
|
11 years ago |
|
wanglinchun
|
12f3da8416
|
sdf
|
11 years ago |
|
wanglinchun
|
947c0f8f64
|
竞赛页面中添加参赛作品成功创建的提示语
|
11 years ago |
|
wanglinchun
|
dd43e2c3fc
|
竞赛页面我要参赛中添加判断，当用户未登录时提示登录后参赛
|
11 years ago |
|
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
11 years ago |
|
wanglinchun
|
10b34341c7
|
修改参赛作品编辑页面说明文字：应用--》作品
|
11 years ago |
|
wanglinchun
|
2c30008981
|
竞赛页面中我要参赛下面修改温馨提示内容
|
11 years ago |
|
wanglinchun
|
f815410381
|
修改了新建参赛作品中托管项目的显示颜色和宽度
|
11 years ago |
|
sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段：name，description，state
|
11 years ago |
|
wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
11 years ago |
|
wanglinchun
|
84ae8a1cde
|
调整了新建参赛作品的显示样式
|
11 years ago |
|
wanglinchun
|
73175aa9b8
|
调整好了参加竞赛的项目列表显示样式
|
11 years ago |
|
wanglinchun
|
44ec6eabf6
|
完成了竞赛中参赛应用列表显示的调整
|
11 years ago |
|
wanglinchun
|
a0a2d04bd7
|
参赛项目取出提交的人
|
11 years ago |
|
wanglinchun
|
cea41a7aab
|
df
|
11 years ago |
