 wanglinchun
|
9f75bf179a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-25 16:22:05 +08:00 |
yanxd
|
8f5958abc1
|
mao
|
2014-04-25 16:08:00 +08:00 |
|
wanglinchun
|
189b935d5b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
2014-04-25 11:22:33 +08:00 |
|
wanglinchun
|
ed71a3faa1
|
调整删除竞赛的显示样式及位置
|
2014-04-25 11:10:13 +08:00 |
Wen
|
02295e5ca9
|
给严总调试用
|
2014-04-25 09:40:05 +08:00 |
|
Wen
|
cc738edf2f
|
学校列表添加了搜索功能
|
2014-04-25 09:40:04 +08:00 |
 kg
|
14511c079a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-24 14:38:32 +08:00 |
|
yanxd
|
cee205a568
|
issues#377 074e8adf 引入的issue页面权限问题，除了控制器还修改过views判断语句 keyworks: @edit_allowed
issues#379 tag字符串短
issues#380 tag 提交之后 不隐藏输入框
issues#381 搜索框有误
|
2014-04-24 10:16:49 +08:00 |
|
kg
|
daa19de51d
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-24 09:13:51 +08:00 |
|
kg
|
271427d29e
|
homepage status
|
2014-04-24 08:18:14 +08:00 |
|
Wen
|
6a2626c90e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-23 21:41:02 +08:00 |
|
Wen
|
473a44d11a
|
学校-课程模式！
|
2014-04-23 21:20:03 +08:00 |
|
wanglinchun
|
9af6c03547
|
Merge branch 'competition' into develop
Conflicts:
Gemfile.lock
app/views/layouts/_base_footer.html.erb
|
2014-04-23 17:18:53 +08:00 |
|
wanglinchun
|
6b5452f3e2
|
增加修改应用时提示语
|
2014-04-23 17:06:48 +08:00 |
|
wanglinchun
|
a90804b312
|
修改上传应用软件包和截图的说明文字
|
2014-04-23 09:58:37 +08:00 |
|
yanxd
|
60bc3bb1b2
|
seem_rateable to lib, using Engine setting routes
|
2014-04-23 08:51:46 +08:00 |
|
wanglinchun
|
05c0d2a5ac
|
替换竞赛模块首页中竞赛和应用的图标并调整相应的格式
|
2014-04-22 19:27:31 +08:00 |
|
wanglinchun
|
8a429ec669
|
首页提示语
|
2014-04-21 19:40:04 +08:00 |
 alan
|
87fdecdabd
|
创新竞赛添加删除功能
|
2014-04-21 18:13:57 +08:00 |
|
yanxd
|
b4209b7cc5
|
jrating
|
2014-04-21 15:41:51 +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 |
|
wanglinchun
|
8f6d9fc6a5
|
0418
|
2014-04-18 10:46:29 +08:00 |
|
kg
|
d450da9df8
|
footer , footer of base_course,upload files count and delete all upload
|
2014-04-17 08:33:44 +08:00 |
|
wanglinchun
|
a52e057d94
|
修改添加应用不能刷新的问题
|
2014-04-16 21:44:52 +08:00 |
|
yanxd
|
84d3e40c41
|
zip down controller created
|
2014-04-16 11:27:08 +08:00 |
|
wanglinchun
|
6421f02ac8
|
调整了参赛应用列表布局显示样式
|
2014-04-16 08:46:04 +08:00 |
|
Wen
|
c34f2da385
|
课程注册与用户注册页面的学校选择全部搞定！
|
2014-04-15 17:37:38 +08:00 |
|
Wen
|
37bb5341e4
|
省份与学校的级联完成！
|
2014-04-15 16:57:19 +08:00 |
|
wanglinchun
|
b4b61a3422
|
修改小bug；设计打分和评论唯一性前提交版
|
2014-04-14 21:54:54 +08:00 |
|
yanxd
|
41f315aac0
|
压缩文件
|
2014-04-14 17:37:03 +08:00 |
|
wanglinchun
|
733497fef8
|
调整竞赛列表页面中部分统计数字的超链接
|
2014-04-14 17:29:38 +08:00 |
|
yanxd
|
4f5eff09c8
|
发帖内容验证不通过不会丢失信息了，加上了所有验证
|
2014-04-14 10:15:18 +08:00 |
|
wanglinchun
|
98b6493b91
|
给应用添加开发人员字段及显示
|
2014-04-14 09:50:36 +08:00 |
|
wanglinchun
|
a4df4cf893
|
修改竞赛和参与竞赛的新建应用之间的关联关系
|
2014-04-11 16:40:09 +08:00 |
|
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前，目前部分代码由于数据表及关联没考虑清楚，导致无法关联，下一步修改代码，重新建表，完成关联功能及应用的正常显示
|
2014-04-11 09:00:00 +08:00 |
|
wanglinchun
|
be61b9d1ac
|
调整了具体应用页面评价应用的功能
|
2014-04-10 08:33:30 +08:00 |
|
yanxd
|
1b6cdeac05
|
列表上提交作业，大概好了吧
|
2014-04-09 11:06:13 +08:00 |
 nieguanghui
|
bad170fdb2
|
应用上传附件功能
|
2014-04-09 09:25:24 +08:00 |
|
wanglinchun
|
a9e9171441
|
通过脚手架新建了一套应用的东西，包括数据库的相应表，新建了发布应用的页面，上传图片功能未实现，界面格式还需调整
|
2014-04-04 17:54:20 +08:00 |
|
wanglinchun
|
c86af5f483
|
与show_application相关的所有内容改为show_softapplication，以防和系统中的application冲突
|
2014-04-04 11:17:50 +08:00 |
|
wanglinchun
|
1e7e0a1bb5
|
修改加入竞赛和退出竞赛不能刷新的问题；新建项目后不能刷新的问题；竞赛列表和竞赛页面搜索问题
|
2014-04-03 22:15:19 +08:00 |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
2014-04-03 17:26:56 +08:00 |
|
yanxd
|
dc62e89816
|
汉化部分
|
2014-04-01 09:52:52 +08:00 |
|
yanxd
|
d6068c5c74
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-03-31 19:27:17 +08:00 |
xianbo
|
e4939bca2c
|
fix
|
2014-03-31 19:29:21 +08:00 |
|
yanxd
|
4f5216e632
|
merge
|
2014-03-31 17:11:41 +08:00 |
|
yanxd
|
930bc4083e
|
forge 软件
|
2014-03-31 17:02:28 +08:00 |
|
xianbo
|
5c63ea2378
|
add contest and fix url
|
2014-03-31 10:56:29 +08:00 |
|
yanxd
|
575fc48ff0
|
首页搜索分类
|
2014-03-25 16:53:11 +08:00 |
|
yanxd
|
6bef7029bc
|
项目课程分不清，添加解释语句
|
2014-03-25 15:21:38 +08:00 |