3 Commits

Author	SHA1	Message	Date
huang	12eaac5683	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: app/views/boards/_project_show.html.erb public/javascripts/course.js 处理冲突 修改项目动态分页 项目到航天中添加“新建项目”	2015-04-07 13:47:39 +08:00
lizanle	ceb6af7365	课程相关模块添加编辑器	2015-04-03 11:19:15 +08:00
lizanle	d1bc2b85d0	kindeditor。	2015-03-26 16:12:03 +08:00