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
..
.gitkeep	导航栏防止意外http参数不全的错误	2014-02-17 15:37:04 +08:00
activities.yml	initial crawl	2014-03-29 10:57:36 +08:00
apply_project_masters.yml	修改框架，添加"没有帮助"和"申请成为版主"功能	2014-04-03 20:47:09 +08:00
attachments.yml	maoxian	2014-03-05 11:17:16 +08:00
attachmentstypes.yml	1.添加资源类型control、model及表结构	2014-05-08 18:03:48 +08:00
boards.yml	add maoxj fixture to test unit	2014-02-17 16:51:12 +08:00
contesting_softapplications.yml	给应用添加开发人员字段及显示	2014-04-14 09:50:36 +08:00
courses.yml	fixtures fix, header fix dynamic.	2014-02-19 17:23:24 +08:00
forums.yml	initial crawl	2014-03-29 10:57:36 +08:00
homework_users.yml	1.增加作业参与人员类homework_users及相关代码	2014-05-19 17:44:36 +08:00
join_in_contests.yml	user score	2014-04-21 11:13:45 +08:00
journal_replies.yml	initial crawl	2014-03-29 10:57:36 +08:00
journals.yml	add maoxj fixture to test unit	2014-02-17 16:51:12 +08:00
member_roles.yml	add maoxj fixture to test unit	2014-02-17 16:51:12 +08:00
members.yml	add data fixtures with real info from webdatabase.	2014-02-18 10:58:34 +08:00
memos.yml	add maoxj fixture to test unit	2014-02-17 16:51:12 +08:00
messages.yml	add maoxj fixture to test unit	2014-02-17 16:51:12 +08:00
news.yml	add maoxj fixture to test unit	2014-02-17 16:51:12 +08:00
no_uses.yml	修改框架，添加"没有帮助"和"申请成为版主"功能	2014-04-03 20:47:09 +08:00
open_source_projects.yml	initial crawl	2014-03-29 10:57:36 +08:00
projects.yml	add data fixtures with real info from webdatabase.	2014-02-18 10:58:34 +08:00
projects_trackers.yml	add maoxj fixture to test unit	2014-02-17 16:51:12 +08:00
relative_memo_to_open_source_projects.yml	添加一张连接表relative_memo_to_open_source_projects	2014-05-19 15:40:53 +08:00
relative_memos.yml	建立了open source project部分的框架，并且建立了相应的帖子	2014-04-01 08:51:43 +08:00
roles.yml	add maoxj fixture to test unit	2014-02-17 16:51:12 +08:00
schools.yml	school表done	2014-03-20 16:19:16 +08:00
softapplications.yml	通过脚手架新建了一套应用的东西，包括数据库的相应表，新建了发布应用的页面，上传图片功能未实现，界面格式还需调整	2014-04-04 17:54:20 +08:00
tokens.yml	add maoxj fixture to test unit	2014-02-17 16:51:12 +08:00
trackers.yml	add maoxj fixture to test unit	2014-02-17 16:51:12 +08:00
user_extensions.yml	add maoxj fixture to test unit	2014-02-17 16:51:12 +08:00
user_preferences.yml	add maoxj fixture to test unit	2014-02-17 16:51:12 +08:00
users.yml	add maoxj fixture to test unit	2014-02-17 16:51:12 +08:00
watchers.yml	add maoxj fixture to test unit	2014-02-17 16:51:12 +08:00