 sw
|
f4fd1b1133
|
修改创建竞赛时提示描述不正确的问题
|
11 years ago |
|
sw
|
2b12654796
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
9688a73aa1
|
1.新建竞赛作品增加js验证
2.修复上传图片一次超过2张，上传失败的BUG
|
11 years ago |
 chenmin
|
ace256bea1
|
修复竞赛模块用户留言挡住右边图标的问题
|
11 years ago |
|
sw
|
46ba7f6a7b
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
fb50defbec
|
修复按钮回去不正确的问题
|
11 years ago |
|
sw
|
08821b9391
|
Merge branch 'szzh' into develop
|
11 years ago |
 nwb
|
5a2d0ce649
|
issue#1077 新建竞赛的奖金换行显示，长度约束
|
11 years ago |
|
sw
|
d66dc65cca
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
bb6be3ed8a
|
修改html错误
|
11 years ago |
|
sw
|
1f4943483e
|
1.现在竞赛作品名称、开发人员、开发环境的长度
2.修复竞赛作品一上传的图片，编辑时资源列表不显示的问题
|
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 |
|
nwb
|
b655f0c7b0
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
29618d6a72
|
竞赛界面调整
|
11 years ago |
|
nwb
|
b7c4f87a8f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
Conflicts:
app/views/welcome/index.html.erb
|
11 years ago |
|
z9hang
|
6b6fd2906f
|
竞赛列表。贴吧列表的非空判断
数据迁移报错问题修改
|
11 years ago |
|
nwb
|
dd396a6da2
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
b4ee106ce9
|
竞赛搜索项为空时给出提示
|
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 |
senluo
|
cde34e42bc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
11 years ago |
 yanxd
|
579f1d4d31
|
start align-center
|
11 years ago |
|
z9hang
|
eae3918074
|
添加用户得数统计功能
帖子内的踩顶横排
|
11 years ago |
|
wanglinchun
|
43449e66b5
|
增加了竞赛通知按钮
|
11 years ago |
|
wanglinchun
|
a1083fe900
|
修改了原有参赛作品显示报500；
修改了作品删除功能报错
|
11 years ago |
|
wanglinchun
|
7b6c96a8b6
|
view中contests中的文件已经全部国际化
|
11 years ago |
|
wanglinchun
|
8b356cddb1
|
修改用户留言页面中未登录状态下的提示语位置
|
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 |
