socialforge/app
cxt ea66ca5e00 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
	public/javascripts/init_activity_KindEditor.js
2015-10-14 11:41:30 +08:00
..
api/mobile 首页动态优化 2015-07-24 11:47:45 +08:00
assets 添加功能:管理员界面发送系统消息 2015-09-09 17:05:32 +08:00
controllers Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-14 11:41:30 +08:00
helpers 1.增加课程问卷、项目讨论、项目新闻对应界面的标题 2015-10-10 16:03:31 +08:00
models 个人主页添加个人留言动态 2015-10-14 11:38:16 +08:00
services 项目邀请添加:姓、名、性别 2015-10-09 10:33:10 +08:00
sweepers
tasks 修改发系统消息后跳转路劲 2015-09-11 09:45:28 +08:00
views Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-14 11:41:30 +08:00