Commit Graph

5 Commits

Author SHA1 Message Date
cxt fc67e6e3be Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
	app/views/users/_anonymous_evaluation_list.html.erb
2016-12-17 10:25:48 +08:00
daiao 882ceb6a63 个人主页样式调整 2016-12-17 10:12:56 +08:00
cxt d876962f05 课程社区和项目社区的左侧列表无法收回 2016-12-17 09:53:23 +08:00
cxt 2275a0ecae 首页、课程社区、项目社区的点击展开更多 2016-12-17 09:38:32 +08:00
huang 6e67e4a5c7 0 2016-12-12 10:55:19 +08:00