6 Commits

Author	SHA1	Message	Date
Tim	8feea07825	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop ... Conflicts: db/schema.rb	2016-01-14 15:59:50 +08:00
ouyangxuhua	48f931deba	隐藏组织的课程/项目快捷菜单	2016-01-11 17:02:01 +08:00
ouyangxuhua	5eceb3d841	解决一些bug; 增加已设为首页标签	2016-01-08 14:42:21 +08:00
ouyangxuhua	66bf50098a	增加组织/个人屏蔽项目/课程动态功能	2016-01-08 14:12:55 +08:00
ouyangxuhua	539d971901	组织页面也增加项目/课程快捷菜单	2016-01-07 16:37:41 +08:00
ouyangxuhua	219774afab	将课程动态加入组织动态中	2015-11-18 16:05:08 +08:00