ouyangxuhua d820977d5d Merge branch 'develop' into ouyang ... Conflicts: app/views/blog_comments/show.html.erb app/views/courses/syllabus.html.erb app/views/messages/_org_subfield_show.html.erb		2016-02-02 15:51:18 +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' of https://git.trustie.net/jacknudt/trustieforge into develop	2016-01-29 19:44:04 +08:00
helpers	私信配置按钮显示	2016-02-01 10:40:42 +08:00
models	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	2016-01-29 19:44:04 +08:00
services	课程配置页面的结束学期可修改	2016-01-22 15:17:11 +08:00
sweepers	…
tasks	修改发系统消息后跳转路劲	2015-09-11 09:45:28 +08:00
views	Merge branch 'develop' into ouyang	2016-02-02 15:51:18 +08:00