 alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
859a1122b7
|
修改contest中contestnotification列表和通知公告的界面
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
 z9hang
|
258967263e
|
1、代码优化。2、很多页面标题不正确问题
|
11 years ago |
 sw
|
e765445279
|
#1298修复竞赛作品简介超出边框的BUG
|
11 years ago |
|
sw
|
4b40824111
|
#1341修复创新竞赛--用户留言：回复留言显示的是真实姓名的BUG
|
11 years ago |
|
sw
|
8f402fe0b7
|
#562课程讨论区回复增加js验证
参赛作品js验证增加左右两端空格去除
|
11 years ago |
|
sw
|
395ae35a0e
|
#1148 调整所有日期为选择，不可手动输入
|
11 years ago |
|
alan
|
b88c361525
|
修改新建参赛作品样式
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
4604720475
|
修改竞赛作品信息
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
a823700300
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
c3341eb368
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/contests/index.html.erb
从远端下载该文件到本地
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
f78be4ea51
|
解决竞赛作品提交不了bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
5d65901ebd
|
解决冲突
|
11 years ago |
|
alan
|
875249ba58
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/contests/index.html.erb
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
02470491bd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/contests/index.html.erb
|
11 years ago |
|
alan
|
0e07bed1ad
|
将contest 中的中文转换成zh.yml中的标签
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
245e0a858c
|
修复新建竞赛连接错误
|
11 years ago |
|
sw
|
d1435e07d4
|
首页隐藏显示微信扫码 #1152
解决方案：将微信扫码作为一个独立的连接页面，隐藏连接
|
11 years ago |
|
alan
|
8c19ec8aa0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/projects_helper.rb
app/views/contest_notification/show.html.erb
Signed-off-by: alan <547533434@qq.com>
|
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 |
|
alan
|
70b079041c
|
修改contests_controller.rb，contest.rb, contest_project.rb,contests_helper.rb,
attachments_helper.rb, application_helper.rb.
主要修改内容: 书写规范， for循环用 each 代替， if 语句的合并， unless 转换成if,
函数名称拼写错误。
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
linhk
|
08d59b9820
|
修改google中“参加竞赛”页面部分字重叠Bug
|
11 years ago |
|
sw
|
b49e76bf79
|
Merge branch 'xiaoguang-contest' into szzh
Conflicts:
app/views/softapplications/show.html.erb
app/views/welcome/contest.html.erb
|
11 years ago |
|
sw
|
fbb19480f5
|
修复火狐不兼容自动换行的问题
|
11 years ago |
hhuai
|
0cbcaa88e8
|
fixed issue 1013,“奖励方式”未对非汉字类型进行自动换行处理
|
11 years ago |
|
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 |
