Commit Graph

12 Commits

Author SHA1 Message Date
ouyangxuhua cdd997e45e kindeditor回复框修改 2016-02-01 14:50:45 +08:00
ouyangxuhua dc3278274d 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
cxt 7d663ce66f 动态内容统一高度 2016-01-08 14:53:12 +08:00
huang 738acad211 展开、收缩 2016-01-05 16:52:34 +08:00
huang 1f09817e4d 增加课程讨论区/项目讨论展开更多功能
博客列表页面展开更多
统一展开高度为一个屏幕
2016-01-05 12:59:59 +08:00
cxt 3dac8d2944 课程/项目帖子的编辑/删除跳转 所有用户都有发送帖子的权限 2015-12-31 17:53:05 +08:00
huang 5618fe067a 项目分页,点击加载 2015-12-29 16:40:07 +08:00
huang b6cf709696 解决讨论区冲突 2015-12-29 11:29:43 +08:00
huang c29e6f1b14 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/boards/_project_show.html.erb
	app/views/boards/_project_show_detail.html.erb

解决冲突
2015-12-29 11:09:16 +08:00
huang 5060ec26bb 项目讨论区 2015-12-29 11:04:20 +08:00
Tim b0b4527ea1 Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
	public/stylesheets/org.css
2015-12-24 10:40:00 +08:00
ouyangxuhua 9e0b88c186 项目讨论区样式改成方块样式 2015-12-24 09:46:18 +08:00