whimlex 4b19463db7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: app/views/layouts/base_projects.html.erb app/views/users/show.html.erb config/locales/zh.yml		2015-03-10 10:08:18 +08:00
..
api/mobile	修正api配置	2015-03-09 15:27:01 +08:00
assets	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-01-30 14:27:56 +08:00
controllers	1、课程首页2、用户首页3、课程留言页4、发布作业页5、用户的留言页6、为课程作业创建作品页传递apptoken参数时自动登录功能	2015-03-09 17:28:17 +08:00
helpers	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-03-10 10:08:18 +08:00
models	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-03-10 10:08:18 +08:00
services	用户课程动态按更新时间倒序排列	2015-03-09 17:32:38 +08:00
sweepers	first commit	2013-08-01 10:33:49 +08:00
views	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-03-10 10:08:18 +08:00