 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
|
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
|
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
|
bc50d5f469
|
允许上传空文件
|
2014-07-18 14:35:44 +08:00 |
|
sw
|
46c7a4bb9f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 14:15:52 +08:00 |
|
sw
|
4a04d47c3c
|
commit
|
2014-07-18 14:15:30 +08:00 |
|
nwb
|
29618d6a72
|
竞赛界面调整
|
2014-07-18 13:48:45 +08:00 |
|
nwb
|
c443de5873
|
去掉课程名称验证
|
2014-07-18 11:49:47 +08:00 |
|
nwb
|
5272a90227
|
修改人数显示
|
2014-07-18 11:35:05 +08:00 |
|
nwb
|
7898bc1dd7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 11:25:16 +08:00 |
|
nwb
|
046142f437
|
优化students_for_courses表相关逻辑
|
2014-07-18 11:25:04 +08:00 |
|
yanxd
|
df848ca756
|
print tag exception, course name valid test.
|
2014-07-18 11:08:36 +08:00 |
|
sw
|
5838b3e47d
|
不选择新闻时，取消"添加新闻"按钮的显示。不选择问题跟踪时，取消“新建问题”和“自定义查询”按钮的显示,不选择讨论区时，取消“发布新帖”按钮的显示
|
2014-07-18 10:54:22 +08:00 |
|
z9hang
|
057447f810
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 10:49:38 +08:00 |
|
nwb
|
a4d06fbb12
|
课程成员设置为只能使用单一权限
|
2014-07-18 10:29:49 +08:00 |
|
sw
|
6f858795ef
|
项目模块配置未选中wiki时，取消左侧项目工具集的WIKI显示
|
2014-07-18 10:24:49 +08:00 |
|
sw
|
bcaaa02bed
|
取消已完成课程在软件创客列表的显示
|
2014-07-18 10:01:54 +08:00 |
|
nwb
|
6968039c87
|
修改课程学生计算函数
|
2014-07-18 09:55:10 +08:00 |
|
z9hang
|
036f8a3870
|
user.trustie.net域名下的用户列表课程项目链接跳转域名不正确
|
2014-07-18 09:46:11 +08:00 |
|
nwb
|
28543e3288
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 09:21:21 +08:00 |
|
nwb
|
8eac756ac7
|
1.项目首页的描述更改，不再限制项目描述字数
2.竞赛首页的描述更改，不再限制竞赛描述字数
|
2014-07-18 09:21:09 +08:00 |
|
yanxd
|
164ec645ee
|
boards created frequently, css file file EOF.
|
2014-07-18 09:20:16 +08:00 |