ouyangxuhua 098844a910 Merge branch 'develop' into ouyangxuhua ... Conflicts: app/helpers/application_helper.rb app/views/organizations/_org_course_homework.html.erb app/views/organizations/_org_course_news.html.erb app/views/organizations/_org_project_issue.html.erb app/views/organizations/_project_message.html.erb app/views/organizations/_show_org_document.html.erb app/views/users/_user_message_course.html.erb		2016-03-15 13:40:33 +08:00
..
api/mobile	issue回复局部刷新	2016-01-22 17:27:21 +08:00
assets	1.解决一些bug;2.组织子目录功能实现	2016-01-13 15:17:13 +08:00
controllers	Merge branch 'develop' into ouyangxuhua	2016-03-15 13:40:33 +08:00
helpers	Merge branch 'develop' into ouyangxuhua	2016-03-15 13:40:33 +08:00
models	Merge branch 'develop' into ouyangxuhua	2016-03-15 13:40:33 +08:00
services	低版本的谷歌浏览器无法修改课程密码	2016-02-23 15:51:33 +08:00
sweepers	…
tasks	…
views	Merge branch 'develop' into ouyangxuhua	2016-03-15 13:40:33 +08:00