huang 5b9be0bb11 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh ... Conflicts: db/schema.rb public/stylesheets/public.css		2016-01-08 18:11:54 +08:00
..
_course_message_edit.html.erb	课程讨论区编辑帖子报错	2015-10-20 15:15:18 +08:00
_course_new.html.erb	转换为remote js	2015-12-14 17:13:57 +08:00
_course_show.html.erb	课程讨论区的加载更多	2015-12-18 17:28:47 +08:00
_course_show_detail.html.erb	动态内容统一高度	2016-01-08 14:53:12 +08:00
_edit.html.erb	...	2015-05-26 17:01:25 +08:00
_form.html.erb	编程作业取消，并设定匿评为内置功能	2015-08-15 10:45:56 +08:00
_form_course.html.erb	...	2015-06-16 12:01:06 +08:00
_form_project.html.erb	...	2015-06-16 12:01:06 +08:00
_org_subfield_message_edit.html.erb	帖子发送到组织资源栏目，同时增加增删查改功能	2015-12-30 15:46:01 +08:00
_org_subfield_new.html.erb	帖子发送到组织资源栏目，同时增加增删查改功能	2015-12-30 15:46:01 +08:00
_project_message_edit.html.erb	编辑项目帖子样式改成方块样式	2015-12-24 11:58:00 +08:00
_project_new.html.erb	项目讨论区	2015-12-29 11:04:20 +08:00
_project_new_topic.html.erb	Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq	2015-12-24 10:40:00 +08:00
_project_show.html.erb	解决讨论区冲突	2015-12-29 11:29:43 +08:00
_project_show_detail.html.erb	动态内容统一高度	2016-01-08 14:53:12 +08:00
edit.html.erb	first commit	2013-08-01 10:33:49 +08:00
index.html.erb	#1163项目、课程讨论区新建帖子增加js验证	2014-10-27 14:20:59 +08:00
new.html.erb	first commit	2013-08-01 10:33:49 +08:00
show.html.erb	为解决完：	2015-12-31 17:08:27 +08:00
show.js.erb	项目分页，点击加载	2015-12-29 16:40:07 +08:00