 yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
2014-05-22 09:58:19 +08:00 |
 nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
2014-05-21 16:45:11 +08:00 |
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
2014-05-21 11:09:22 +08:00 |
 fanqiang
|
c5dd0317c2
|
修改合并后的bug（open_source_project）
|
2014-05-21 09:54:05 +08:00 |
|
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
2014-05-20 14:33:50 +08:00 |
|
fanqiang
|
87a6dd4938
|
修改开源项目社区中 每个项目的结构， 不再是一对一的匹配帖子，而是添加了一个中间表
|
2014-05-20 10:06:59 +08:00 |
 sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段：name，description，state
|
2014-05-19 17:44:36 +08:00 |
|
fanqiang
|
543a199c5f
|
添加一张连接表relative_memo_to_open_source_projects
|
2014-05-19 15:40:53 +08:00 |
|
fanqiang
|
a07ae9be58
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-19 15:38:18 +08:00 |
 wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
2014-05-16 17:06:38 +08:00 |
|
fanqiang
|
4ee9602621
|
..
|
2014-05-15 10:51:48 +08:00 |
|
fanqiang
|
74169221a3
|
1234
|
2014-05-15 10:33:52 +08:00 |
|
fanqiang
|
c6ee7e53e6
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-15 10:05:25 +08:00 |
|
fanqiang
|
1a7c82174c
|
修改表结构
|
2014-05-15 10:05:05 +08:00 |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
2014-05-15 09:46:38 +08:00 |
|
wanglinchun
|
a8b58016fa
|
df
|
2014-05-14 09:09:49 +08:00 |
|
wanglinchun
|
bbd293272d
|
添加参赛作品所属项目的网址；
参赛应用页面添加所属项目网址；
|
2014-05-13 16:49:23 +08:00 |
|
yanxd
|
225f25f04c
|
指定utf8，中文编码出错
|
2014-05-13 15:54:59 +08:00 |
|
nwb
|
284e6ba20a
|
1.添加部分默认数据
2.修改项目资源视图
|
2014-05-13 15:49:14 +08:00 |
|
yanxd
|
9976697a58
|
Merge remote-tracking branch 'origin/develop' into szzh
|
2014-05-10 14:27:48 +08:00 |
|
nwb
|
50cc682e02
|
添加数据库脚本文件
|
2014-05-09 17:27:04 +08:00 |
|
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
2014-05-09 17:13:23 +08:00 |
|
nwb
|
42e6fc6a68
|
1.添加资源类型control、model及表结构
2.资源(attachments)添加资源分类属性
|
2014-05-08 18:03:48 +08:00 |
|
Wen
|
d94e15cd94
|
用户打分
|
2014-05-06 15:15:29 +08:00 |
|
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
|
2014-05-05 09:11:59 +08:00 |
|
Wen
|
a8e029da58
|
数据库迁移：更改了默认的学校logo
|
2014-04-28 09:44:40 +08:00 |
|
fanqiang
|
87c70909be
|
可以在开源社区添加帖子，并且添加了帖子的URL,即帖子来源
|
2014-04-28 09:13:57 +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
|
4c3955bca0
|
revert create tmp
This reverts commit 6bfcf094d9.
|
2014-04-21 16:53:13 +08:00 |
|
yanxd
|
6bfcf094d9
|
f**k
|
2014-04-21 16:21:39 +08:00 |
|
yanxd
|
e802424e2a
|
merge jrating
|
2014-04-21 15:43:00 +08:00 |
|
yanxd
|
b4209b7cc5
|
jrating
|
2014-04-21 15:41:51 +08:00 |
|
xianbo
|
0a5de653d0
|
fix db migrate
|
2014-04-21 14:07:54 +08:00 |
 baiyu
|
f0b497e455
|
user score merge
|
2014-04-21 11:15:41 +08:00 |
|
baiyu
|
36cd91401f
|
user score
|
2014-04-21 11:13:45 +08:00 |
 alan
|
dd09c36a8f
|
Added the message of creating the project in the project's activities
|
2014-04-21 09:32:55 +08:00 |
|
fanqiang
|
a611ed4848
|
修改了按标签搜索，并改了一些样式
|
2014-04-19 11:03:54 +08:00 |
|
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
|
2014-04-18 16:03:52 +08:00 |
|
wanglinchun
|
abef68d13a
|
修改了添加项目时不能自动刷新的问题
|
2014-04-18 09:06:52 +08:00 |
|
Wen
|
5699a947ec
|
建立了学校与用户的关联
课程与用户的学校字段均为学校id而不再是学校名称
页面暂时改了想到的地方= =
|
2014-04-17 17:36:41 +08:00 |
|
Wen
|
c34f2da385
|
课程注册与用户注册页面的学校选择全部搞定！
|
2014-04-15 17:37:38 +08:00 |
|
wanglinchun
|
98b6493b91
|
给应用添加开发人员字段及显示
|
2014-04-14 09:50:36 +08:00 |
 nieguanghui
|
6baa87a8ea
|
修复项目列表分数显示不一致的问题，修改用户列表显示不一致的问题，修改作业中项目显示分数和项目内部分数不一致的问题
|
2014-04-11 10:53:51 +08:00 |
|
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前，目前部分代码由于数据表及关联没考虑清楚，导致无法关联，下一步修改代码，重新建表，完成关联功能及应用的正常显示
|
2014-04-11 09:00:00 +08:00 |
|
nieguanghui
|
b334c02244
|
评分修改迁移文件
|
2014-04-10 16:40:29 +08:00 |
|
fanqiang
|
89b668be82
|
添加申请版主功能，目前已经可以写入数据库
|
2014-04-06 16:34:23 +08:00 |