 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
|
12 years ago |
|
wanglinchun
|
abef68d13a
|
修改了添加项目时不能自动刷新的问题
|
12 years ago |
Wen
|
5699a947ec
|
建立了学校与用户的关联
课程与用户的学校字段均为学校id而不再是学校名称
页面暂时改了想到的地方= =
|
12 years ago |
|
Wen
|
c34f2da385
|
课程注册与用户注册页面的学校选择全部搞定！
|
12 years ago |
|
wanglinchun
|
98b6493b91
|
给应用添加开发人员字段及显示
|
12 years ago |
 nieguanghui
|
6baa87a8ea
|
修复项目列表分数显示不一致的问题，修改用户列表显示不一致的问题，修改作业中项目显示分数和项目内部分数不一致的问题
|
12 years ago |
|
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前，目前部分代码由于数据表及关联没考虑清楚，导致无法关联，下一步修改代码，重新建表，完成关联功能及应用的正常显示
|
12 years ago |
|
nieguanghui
|
b334c02244
|
评分修改迁移文件
|
12 years ago |
|
wanglinchun
|
a9e9171441
|
通过脚手架新建了一套应用的东西，包括数据库的相应表，新建了发布应用的页面，上传图片功能未实现，界面格式还需调整
|
12 years ago |
xianbo
|
b063364b60
|
fix migrate
|
12 years ago |
|
wanglinchun
|
c86af5f483
|
与show_application相关的所有内容改为show_softapplication，以防和系统中的application冲突
|
12 years ago |
|
wanglinchun
|
2a278e0a2d
|
all
|
12 years ago |
|
Wen
|
4448fdfaca
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
xianbo
|
5c63ea2378
|
add contest and fix url
|
12 years ago |
|
Wen
|
337885503e
|
school表done
建立了school和course的一对多关联
|
12 years ago |
|
Wen
|
bfec67a446
|
删除了courses表中的school列。
重新设计下表= =
|
12 years ago |
|
Wen
|
ccca1f7f5f
|
修改大学表，删除列City
|
12 years ago |
|
Wen
|
ebd09e4b1a
|
大学表创建
|
12 years ago |
|
Wen
|
5200e238a9
|
= =|
|
12 years ago |
|
Wen
|
ac0a05bcc7
|
- -
|
12 years ago |
yanxd
|
ff317e48e9
|
words jourformessage design ing...
|
13 years ago |
|
nieguanghui
|
f3ce918699
|
留言修改
|
13 years ago |
|
yanxd
|
f79cc4e597
|
记录帖子查看次数
|
13 years ago |
|
yanxd
|
c6f4dbbafa
|
10%
|
13 years ago |
 fanqiang
|
6e1913d00d
|
修改新建topic界面
|
13 years ago |
|
yanxd
|
48650a2a91
|
init forum. again.
|
13 years ago |
|
fanqiang
|
16f70437d1
|
forum init.
|
13 years ago |
|
yanxd
|
2932f5a940
|
第一次db:migrate时创建admin的用户扩展表，防止第一次部署出错;为项目版本库diff增加过滤器。
|
13 years ago |
 baiyu
|
005e0802d4
|
增加了竞赛的“加入”
|
13 years ago |
|
yanxd
|
98ccc97b27
|
add hidden repository function
|
13 years ago |
|
nieguanghui
|
adf8a7bc92
|
修改课程活跃度排序方式，解决课程列表文件链接错误
|
13 years ago |
|
nieguanghui
|
50b91e3942
|
修改按钮样式，增加附件过滤
|
13 years ago |
|
xianbo
|
271153aa78
|
add db:migrate/20131031071414_add_setup_time_to_courses.rb
|
13 years ago |
|
xianbo
|
2589d429b0
|
add the project what one watch
|
13 years ago |
|
baiyu
|
39c45dff30
|
1、修改了注册里的问题
2、作业名称改为靠左
3、修改了提交作业、参加竞赛等混乱
4、修改了top bar的字体大小
|
13 years ago |
|
baiyu
|
2a9cb28c4e
|
1、修改了国际化
2、增加了课程“年度”“学期”
3、主讲教师显示bug
|
13 years ago |
|
fanqiang
|
838894a19c
|
修改了需求评分功能，以及作业的提交
|
13 years ago |
 huangjingquan
|
b19ed67d79
|
新的课程
修改了一些bug
|
13 years ago |
 william
|
da82a630e9
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into tmp1
Conflicts:
app/controllers/bids_controller.rb
app/helpers/bids_helper.rb
config/locales/zh.yml
db/schema.rb
|
13 years ago |
|
william
|
4f72b68442
|
bug 修复。
|
13 years ago |
|
william
|
2079c87362
|
增加tag删除。
|
13 years ago |
|
fanqiang
|
781fa32dbb
|
添加了需求的fork功能
|
13 years ago |
|
baiyu
|
436569c88d
|
1、修改了location和identity不能显示的问题
2、修改了学号框样式
|
13 years ago |
|
xianbo
|
633104b493
|
modify some bug about course and add db migrate
|
13 years ago |
|
william
|
61e4021625
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/controllers/bids_controller.rb
app/views/bids/_history.html.erb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
config/locales/zh.yml
config/routes.rb
lib/redmine.rb
|
13 years ago |
|
xianbo
|
29313d9ab5
|
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
|
13 years ago |
|
william
|
7d919fd3c3
|
Merge branch 'liuping' into develop
Conflicts:
app/helpers/bids_helper.rb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
config/locales/zh.yml
db/schema.rb
|
13 years ago |
baiyu
|
24c99b8f49
|
add db migrate
|
13 years ago |
|
xianbo
|
ba12ff19eb
|
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
|
13 years ago |
|
baiyu
|
540f06c769
|
add_student_id_to user
|
13 years ago |
