 z9hang
|
5e4571d6af
|
修复部分页面导航丢失问题
|
2014-07-21 11:14:17 +08:00 |
 nwb
|
2a8929b90f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-21 10:11:36 +08:00 |
|
z9hang
|
f273b60f32
|
更新ReadMe.txt
|
2014-07-19 17:04:44 +08:00 |
|
z9hang
|
162a4cfa84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-19 16:53:02 +08:00 |
|
z9hang
|
0322258386
|
去掉一个参加竞赛中多出来的项目创建
|
2014-07-19 16:52:43 +08:00 |
|
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
|
2014-07-19 16:48:14 +08:00 |
 sw
|
8db6b50a65
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/courses_helper.rb
|
2014-07-19 16:47:05 +08:00 |
|
sw
|
e24323147d
|
修复项目描述过长不会自动换行的BUG
|
2014-07-19 16:45:27 +08:00 |
|
z9hang
|
5c0e3e96cc
|
修复不分页面导航栏缺失问题、修复部分域名错误问题、添加修复FirstPage表数据的迁移文件
|
2014-07-19 16:41:29 +08:00 |
|
sw
|
ba66cde840
|
1.优化作业显示界面加载效率
2.修复获取作业的互评得分、综评得分、教师评分不准确的问题
|
2014-07-19 16:38:29 +08:00 |
|
nwb
|
bda9921fb0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-19 15:58:37 +08:00 |
|
nwb
|
49aa3a994e
|
学时不允许为空
|
2014-07-19 15:58:11 +08:00 |
|
nwb
|
0922715301
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-19 14:41:30 +08:00 |
|
sw
|
6186ff343e
|
去除无效的标签
|
2014-07-19 14:31:25 +08:00 |
|
nwb
|
4259d9c282
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-19 13:28:07 +08:00 |
|
sw
|
fdfba199f3
|
修复评奖位置不正确的问题
|
2014-07-19 13:22:23 +08:00 |
|
sw
|
93d8fd31a0
|
增加作品分类下拉框
|
2014-07-19 13:16:29 +08:00 |
|
sw
|
64f025fe70
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/contests/show_attendingcontest.html.erb
|
2014-07-19 13:16:11 +08:00 |
|
sw
|
71ffdb9164
|
作品分类在下拉列表框中选择
|
2014-07-19 13:13:46 +08:00 |
|
nwb
|
206aeeccfb
|
优化2级菜单效果
|
2014-07-19 11:39:09 +08:00 |
|
sw
|
79c76d26c8
|
创建作品分类表，并插入部分数据
|
2014-07-19 11:35:43 +08:00 |
|
nwb
|
f20f0aaa45
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-19 11:11:58 +08:00 |
|
nwb
|
60fa473608
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-19 10:59:30 +08:00 |
|
nwb
|
6bced5106e
|
调整课程列表视图
|
2014-07-19 10:55:46 +08:00 |
|
sw
|
9fe4c9f8a2
|
修改竞赛作品列表显示样式与创建作品样式
|
2014-07-19 10:44:23 +08:00 |
|
z9hang
|
599a277af3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-19 10:36:24 +08:00 |
|
z9hang
|
74ff5d505d
|
修改加入竞赛创建项目链接域名不正确问题
|
2014-07-19 10:36:11 +08:00 |
|
nwb
|
e1edb46ba2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/models/course.rb
|
2014-07-19 09:42:46 +08:00 |
|
nwb
|
908254b911
|
项目、竞赛首页描述优化，鼠标悬停显示内容优化
|
2014-07-19 09:39:48 +08:00 |
 yanxd
|
f5efaac93a
|
lunchun
|
2014-07-18 17:17:06 +08:00 |
|
yanxd
|
6af11fea68
|
course class period
|
2014-07-18 17:10:41 +08:00 |
|
z9hang
|
40d8ec6c6e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 16:58:25 +08:00 |
|
z9hang
|
4bd083b059
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/show.html.erb
|
2014-07-18 16:56:00 +08:00 |
|
sw
|
6a42ce143b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 16:53:35 +08:00 |
|
z9hang
|
b44b488807
|
导航栏调整
|
2014-07-18 16:51:41 +08:00 |
|
nwb
|
6780167674
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-18 16:45:58 +08:00 |
|
nwb
|
0e0da39113
|
修改BUG
|
2014-07-18 16:44:40 +08:00 |
|
sw
|
9f02003bb9
|
用户课程列表增加自动换行
|
2014-07-18 16:42:18 +08:00 |
|
nwb
|
955cf619b8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 16:42:01 +08:00 |
|
nwb
|
0e9a15aad5
|
短描述修改
|
2014-07-18 16:41:55 +08:00 |
|
sw
|
41983833d7
|
用户项目列表增加自动换行
|
2014-07-18 16:40:57 +08:00 |
|
z9hang
|
bd43ef5d61
|
网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复
|
2014-07-18 16:39:39 +08:00 |
|
sw
|
e0f5708038
|
修改错误
|
2014-07-18 16:21:20 +08:00 |
|
yanxd
|
3f6a298eb4
|
test.course.model
|
2014-07-18 15:58:37 +08:00 |
|
sw
|
999a252f7b
|
修改软件创客搜索结果显示样式
|
2014-07-18 15:47:48 +08:00 |
|
nwb
|
5087f90a26
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 15:33:56 +08:00 |
|
nwb
|
3b9245d143
|
隐藏新建竞赛作品时的作品类型
|
2014-07-18 15:33:47 +08:00 |
|
sw
|
0f3c2ff558
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 15:00:21 +08:00 |
|
nwb
|
0443f2085e
|
修改首页问题
|
2014-07-18 15:00:03 +08:00 |
|
nwb
|
bc50d5f469
|
允许上传空文件
|
2014-07-18 14:35:44 +08:00 |