Commit Graph

11 Commits

Author SHA1 Message Date
huang fe54a19940 Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
Conflicts:
	app/views/blogs/_article.html.erb
	app/views/users/_project_boardlist.html.erb
	public/stylesheets/new_user.css
2016-05-19 16:10:18 +08:00
yuanke 708cb35fd2 增加一个弹框的通用接口pop_up_box 2016-05-16 16:57:18 +08:00
Tim e8424d9b97 项目时间字体大小控制 2016-05-10 10:57:55 +08:00
yuanke 34ea7662b2 将内容省略显示的固定字数改为传参 2016-05-06 17:59:27 +08:00
yuanke 9dc92fe817 列表优化 2016-05-04 16:28:40 +08:00
yuanke 1da8288fe7 列表显示修改 2016-04-29 13:42:58 +08:00
yuanke dd00533084 帖子显示三行好点 2016-04-28 10:32:32 +08:00
yuanke c729c1252d 项目、课程列表显示修改 2016-04-28 10:19:59 +08:00
yuanke c357971e8a 课程列表、项目列表等修改 2016-04-27 16:02:52 +08:00
yuanke 23f48b7189 项目列表、项目讨论区列表 2016-04-27 09:54:49 +08:00
yuanke 43c1120b19 课程问答区 项目讨论区列表 2016-04-26 15:10:47 +08:00