nwb 099e8a0912 Merge branch 'szzh' into CourseModify ... Conflicts: app/controllers/application_controller.rb app/views/attachments/upload.js.erb app/views/courses/_homework_form.html.erb app/views/layouts/base_courses.html.erb app/views/users/_my_joinedcourse.html.erb db/schema.rb lib/redmine.rb lib/redmine/access_control.rb		2014-06-17 10:12:44 +08:00
..
environments	share completed with fq, xianbo	2013-10-21 08:57:55 +08:00
initializers	加入了对赞功能模块，同时预留了踩功能，但暂时不使用。	2013-08-08 17:01:56 +08:00
locales	Merge branch 'szzh' into CourseModify	2014-06-17 10:12:44 +08:00
additional_environment.rb	Add sub-uri	2013-08-11 15:05:55 +08:00
additional_environment.rb.example	first commit	2013-08-01 10:33:49 +08:00
application.rb	0418	2014-04-18 10:46:29 +08:00
boot.rb	first commit	2013-08-01 10:33:49 +08:00
configuration.yml	system bin, 坑	2014-06-13 15:42:59 +08:00
configuration.yml.example	first commit	2013-08-01 10:33:49 +08:00
database.yml.example	fixtures fix, header fix dynamic.	2014-02-19 17:23:24 +08:00
environment.rb	1.添加部分默认数据	2014-05-13 15:49:14 +08:00
preinitializer.rb	first commit	2013-08-01 10:33:49 +08:00
routes.rb	Merge branch 'szzh' into CourseModify	2014-06-17 10:12:44 +08:00
settings.yml	课程权限添加（部分）	2014-06-04 17:39:11 +08:00