Commit Graph

26 Commits

Author SHA1 Message Date
fanqiang daa531268a 添加安全漏洞的关联表
帖子添加一个来源信息
2014-05-22 11:05:15 +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
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
yanxd 9976697a58 Merge remote-tracking branch 'origin/develop' into szzh 2014-05-10 14:27:48 +08:00
nwb 42e6fc6a68 1.添加资源类型control、model及表结构
2.资源(attachments)添加资源分类属性
2014-05-08 18:03:48 +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 00e62ec8f7 用户评分理论上完成版. 2014-04-22 14:53:25 +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
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
yanxd 84d3e40c41 zip down controller created 2014-04-16 11:27:08 +08:00
wanglinchun 98b6493b91 给应用添加开发人员字段及显示 2014-04-14 09:50:36 +08:00
wanglinchun a9e9171441 通过脚手架新建了一套应用的东西,包括数据库的相应表,新建了发布应用的页面,上传图片功能未实现,界面格式还需调整 2014-04-04 17:54:20 +08:00
fanqiang 9af808821d 修改框架,添加"没有帮助"和"申请成为版主"功能 2014-04-03 20:47:09 +08:00
fanqiang cfa5532598 建立了open source project部分的框架,并且建立了相应的帖子 2014-04-01 08:51:43 +08:00
fanqiang d935152ed7 initial crawl 2014-03-29 10:57:36 +08:00
Wen 31b7ab8ae5 创建课程处添加了学校
数据库中存储学校的ID

但是学校与省份的级联还没有做好=A=
2014-03-21 18:02:55 +08:00
Wen 337885503e school表done
建立了school和course的一对多关联
2014-03-20 16:19:16 +08:00
yanxd e9373991d2 maoxian 2014-03-05 11:17:16 +08:00
yanxd 89579396f0 added utf-8 support to test framework. 2014-02-22 09:54:23 +08:00
yanxd cf2689917b 三天两头反复改 不如自挂东南枝 2014-02-22 09:47:59 +08:00
yanxd 3d274be77b fixtures fix, header fix dynamic. 2014-02-19 17:23:24 +08:00
yanxd b06d5c13a8 add data fixtures with real info from webdatabase. 2014-02-18 10:58:34 +08:00
yanxd 6766936ed5 add maoxj fixture to test unit 2014-02-17 16:51:12 +08:00
yanxd 02a03f7c54 导航栏防止意外http参数不全的错误 2014-02-17 15:37:04 +08:00