You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		11 years ago
..
rateable	加入了对赞功能模块，同时预留了踩功能，但暂时不使用。	12 years ago
forums.js	forum init.	12 years ago
memos.js	init forum. again.	12 years ago
praise_tread.js	加入了对赞功能模块，同时预留了踩功能，但暂时不使用。	12 years ago
school.js	创建课程处添加了学校	11 years ago
shares.js	添加app\controllers\shares_controller.rb及相关文件用来作为api演示的小例子，Client.html放在根目录下作为演示客户端	12 years ago
softapplications.js	通过脚手架新建了一套应用的东西，包括数据库的相应表，新建了发布应用的页面，上传图片功能未实现，界面格式还需调整	11 years ago
teachers.js	new version	12 years ago
zipdown.js	zip down controller created	11 years ago