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
..
help	error message: Redmine ==> Trustie	2013-08-12 23:42:39 +08:00
images	更改课程图标显示逻辑，添加课程图标文件夹	2014-06-04 17:30:42 +08:00
javascripts	bootstrap test	2014-05-26 11:27:10 +08:00
statistics/trustie2	move 2013.8.29	2013-08-30 09:34:21 +08:00
stylesheets	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-06-16 09:18:48 +08:00
themes	坑	2014-06-10 17:33:40 +08:00
404.html	error message: Redmine ==> Trustie	2013-08-12 23:42:39 +08:00
500.html	new version	2013-09-12 10:41:15 +08:00
dispatch.fcgi.example	first commit	2013-08-01 10:33:49 +08:00
favicon.ico	first commit	2013-08-01 10:33:49 +08:00
favicon.old.ico	first commit	2013-08-01 10:33:49 +08:00
htaccess.fcgi.example	first commit	2013-08-01 10:33:49 +08:00