Wen
|
a8e029da58
|
数据库迁移：更改了默认的学校logo
|
2014-04-28 09:44:40 +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
|
1ca0113204
|
Merge branch 'competition' into develop
Conflicts:
db/schema.rb
|
2014-04-25 10:26:50 +08:00 |
|
Wen
|
02295e5ca9
|
给严总调试用
|
2014-04-25 09:40:05 +08:00 |
|
wanglinchun
|
6afef880dc
|
修改contest表中budget字段的属性，将integer改为string
|
2014-04-24 19:45:10 +08:00 |
|
Wen
|
3ba524668f
|
用户评分未完成版本= =
上传一下以防丢了
|
2014-04-21 22:34:51 +08:00 |
|
yanxd
|
b4209b7cc5
|
jrating
|
2014-04-21 15:41:51 +08:00 |
 alan
|
dd09c36a8f
|
Added the message of creating the project in the project's activities
|
2014-04-21 09:32:55 +08:00 |
|
wanglinchun
|
abef68d13a
|
修改了添加项目时不能自动刷新的问题
|
2014-04-18 09:06:52 +08:00 |
|
wanglinchun
|
98b6493b91
|
给应用添加开发人员字段及显示
|
2014-04-14 09:50:36 +08:00 |
|
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前，目前部分代码由于数据表及关联没考虑清楚，导致无法关联，下一步修改代码，重新建表，完成关联功能及应用的正常显示
|
2014-04-11 09:00:00 +08:00 |
|
wanglinchun
|
c86af5f483
|
与show_application相关的所有内容改为show_softapplication，以防和系统中的application冲突
|
2014-04-04 11:17:50 +08:00 |
|
Wen
|
4448fdfaca
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-02 14:44:10 +08:00 |
|
xianbo
|
5c63ea2378
|
add contest and fix url
|
2014-03-31 10:56:29 +08:00 |
|
Wen
|
337885503e
|
school表done
建立了school和course的一对多关联
|
2014-03-20 16:19:16 +08:00 |
|
Wen
|
bfec67a446
|
删除了courses表中的school列。
重新设计下表= =
|
2014-03-19 17:36:38 +08:00 |
|
Wen
|
ebd09e4b1a
|
大学表创建
|
2014-03-18 15:19:31 +08:00 |
|
Wen
|
5200e238a9
|
= =|
|
2014-03-18 09:28:40 +08:00 |
|
yanxd
|
ff317e48e9
|
words jourformessage design ing...
|
2013-12-25 09:17:15 +08:00 |
 nieguanghui
|
f3ce918699
|
留言修改
|
2013-12-24 16:42:56 +08:00 |
|
yanxd
|
f79cc4e597
|
记录帖子查看次数
|
2013-12-15 15:10:29 +08:00 |
|
yanxd
|
c6f4dbbafa
|
10%
|
2013-11-23 21:13:59 +08:00 |
|
yanxd
|
48650a2a91
|
init forum. again.
|
2013-11-22 21:55:21 +08:00 |
|
yanxd
|
2932f5a940
|
第一次db:migrate时创建admin的用户扩展表，防止第一次部署出错;为项目版本库diff增加过滤器。
|
2013-11-16 10:37:47 +08:00 |
 baiyu
|
005e0802d4
|
增加了竞赛的“加入”
|
2013-11-14 15:55:56 +08:00 |
|
yanxd
|
98ccc97b27
|
add hidden repository function
|
2013-11-12 10:27:36 +08:00 |
|
nieguanghui
|
adf8a7bc92
|
修改课程活跃度排序方式，解决课程列表文件链接错误
|
2013-11-09 08:26:23 +08:00 |
|
xianbo
|
271153aa78
|
add db:migrate/20131031071414_add_setup_time_to_courses.rb
|
2013-11-02 16:33:09 +08:00 |
|
xianbo
|
2589d429b0
|
add the project what one watch
|
2013-10-24 08:24:56 +08:00 |
|
baiyu
|
39c45dff30
|
1、修改了注册里的问题
2、作业名称改为靠左
3、修改了提交作业、参加竞赛等混乱
4、修改了top bar的字体大小
|
2013-10-09 16:41:02 +08:00 |
 fanqiang
|
838894a19c
|
修改了需求评分功能，以及作业的提交
|
2013-09-29 19:58:57 +08:00 |
 huangjingquan
|
b19ed67d79
|
新的课程
修改了一些bug
|
2013-09-29 19:46:59 +08:00 |
 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
|
2013-09-28 10:36:44 +08:00 |
|
william
|
4f72b68442
|
bug 修复。
|
2013-09-27 15:02:22 +08:00 |
|
william
|
2079c87362
|
增加tag删除。
|
2013-09-27 14:58:51 +08:00 |
|
fanqiang
|
781fa32dbb
|
添加了需求的fork功能
|
2013-09-26 09:06:29 +08:00 |
|
baiyu
|
436569c88d
|
1、修改了location和identity不能显示的问题
2、修改了学号框样式
|
2013-09-25 17:20:40 +08:00 |
|
xianbo
|
633104b493
|
modify some bug about course and add db migrate
|
2013-09-24 12:15:24 +08:00 |
|
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
|
2013-09-24 09:52:08 +08:00 |
|
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
|
2013-09-24 09:14:21 +08:00 |
|
xianbo
|
806fae7b19
|
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
Conflicts:
app/controllers/account_controller.rb
app/controllers/my_controller.rb
app/controllers/projects_controller.rb
app/controllers/users_controller.rb
app/helpers/projects_helper.rb
app/helpers/users_helper.rb
app/models/project.rb
app/models/user.rb
app/models/user_extensions.rb
app/views/account/register.html.erb
app/views/bids/_bid_show.html.erb
app/views/bids/_history.html.erb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
app/views/files/index.html.erb
app/views/layouts/base_bids.html.erb
app/views/layouts/base_users.html.erb
app/views/my/account.html.erb
app/views/users/watch_bids.html.erb
config/locales/en.yml
config/locales/zh.yml
config/routes.rb
db/schema.rb
lib/redmine.rb
public/stylesheets/application.css
|
2013-09-23 20:18:03 +08:00 |
|
william
|
dcbaf1c02b
|
增加需求结束方法。
|
2013-09-23 20:12:32 +08:00 |
|
baiyu
|
4fb040bc61
|
modify register bug
|
2013-09-23 16:42:19 +08:00 |
|
baiyu
|
6ce27271e3
|
修改了身份
增加了职称、学号
|
2013-09-23 09:41:36 +08:00 |
 baiyu
|
c2302dc0c7
|
增加了附件删除功能
修改用户主页中课程与项目之间的关系
用户课程页面中的作业进行了按课程分组
|
2013-09-18 22:56:01 +08:00 |
|
nieguanghui
|
45178e178f
|
fix the projects's present bug
|
2013-09-16 21:47:46 +08:00 |
|
fanqiang
|
805ad6600b
|
添加了提交作业
|
2013-09-13 21:52:24 +08:00 |
|
huangjingquan
|
261c3fc337
|
new version
|
2013-09-12 10:41:15 +08:00 |
|
baiyu
|
a2cc191a4e
|
1、增加“我的账号”里的了工作单位
2、增加了“注册”里的“身份”
|
2013-09-12 08:38:47 +08:00 |
|
xianbo
|
1e7d127998
|
new course table
|
2013-09-06 16:39:38 +08:00 |