xianbo
|
e52886cf46
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/softapplications/show.html.erb
db/schema.rb
|
12 years ago |
|
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
 fanqiang
|
daa531268a
|
添加安全漏洞的关联表
帖子添加一个来源信息
|
12 years ago |
 yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
12 years ago |
 nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
12 years ago |
|
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
12 years ago |
|
fanqiang
|
c5dd0317c2
|
修改合并后的bug（open_source_project）
|
12 years ago |
 wanglinchun
|
dd43e2c3fc
|
竞赛页面我要参赛中添加判断，当用户未登录时提示登录后参赛
|
12 years ago |
|
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
12 years ago |
|
fanqiang
|
87a6dd4938
|
修改开源项目社区中 每个项目的结构， 不再是一对一的匹配帖子，而是添加了一个中间表
|
12 years ago |
 sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段：name，description，state
|
12 years ago |
|
wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
12 years ago |
|
fanqiang
|
543a199c5f
|
添加一张连接表relative_memo_to_open_source_projects
|
12 years ago |
|
fanqiang
|
a07ae9be58
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
12 years ago |
|
fanqiang
|
4ee9602621
|
..
|
12 years ago |
|
fanqiang
|
74169221a3
|
1234
|
12 years ago |
|
fanqiang
|
c6ee7e53e6
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
fanqiang
|
1a7c82174c
|
修改表结构
|
12 years ago |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
12 years ago |
|
wanglinchun
|
a8b58016fa
|
df
|
12 years ago |
|
wanglinchun
|
bbd293272d
|
添加参赛作品所属项目的网址；
参赛应用页面添加所属项目网址；
|
12 years ago |
|
yanxd
|
225f25f04c
|
指定utf8，中文编码出错
|
12 years ago |
|
nwb
|
284e6ba20a
|
1.添加部分默认数据
2.修改项目资源视图
|
12 years ago |
|
yanxd
|
9976697a58
|
Merge remote-tracking branch 'origin/develop' into szzh
|
12 years ago |
|
nwb
|
50cc682e02
|
添加数据库脚本文件
|
12 years ago |
|
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
12 years ago |
|
nwb
|
42e6fc6a68
|
1.添加资源类型control、model及表结构
2.资源(attachments)添加资源分类属性
|
12 years ago |
Wen
|
d94e15cd94
|
用户打分
|
12 years ago |
|
fanqiang
|
2c8580a4e8
|
Merge branch 'crawl' into develop
Conflicts:
app/controllers/tags_controller.rb
app/views/tags/_tag.html.erb
app/views/tags/_tag_search_results.html.erb
app/views/tags/index.html.erb
config/locales/zh.yml
config/routes.rb
db/schema.rb
|
12 years ago |
|
Wen
|
a8e029da58
|
数据库迁移：更改了默认的学校logo
|
12 years ago |
|
fanqiang
|
87c70909be
|
可以在开源社区添加帖子，并且添加了帖子的URL,即帖子来源
|
12 years ago |
|
wanglinchun
|
189b935d5b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
12 years ago |
|
wanglinchun
|
1ca0113204
|
Merge branch 'competition' into develop
Conflicts:
db/schema.rb
|
12 years ago |
|
Wen
|
02295e5ca9
|
给严总调试用
|
12 years ago |
|
wanglinchun
|
6afef880dc
|
修改contest表中budget字段的属性，将integer改为string
|
12 years ago |
|
Wen
|
3ba524668f
|
用户评分未完成版本= =
上传一下以防丢了
|
12 years ago |
yanxd
|
4c3955bca0
|
revert create tmp
This reverts commit 6bfcf094d9.
|
12 years ago |
|
yanxd
|
6bfcf094d9
|
f**k
|
12 years ago |
|
yanxd
|
e802424e2a
|
merge jrating
|
12 years ago |
|
yanxd
|
b4209b7cc5
|
jrating
|
12 years ago |
|
xianbo
|
0a5de653d0
|
fix db migrate
|
12 years ago |
 baiyu
|
f0b497e455
|
user score merge
|
12 years ago |
|
baiyu
|
36cd91401f
|
user score
|
12 years ago |
 alan
|
dd09c36a8f
|
Added the message of creating the project in the project's activities
|
12 years ago |
|
fanqiang
|
a611ed4848
|
修改了按标签搜索，并改了一些样式
|
12 years ago |
|
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 |
