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
..
_course_new.html.erb	1、修改无跳转的href链接为javascript:void(0)	2015-04-15 14:53:07 +08:00
_course_show.html.erb	将课程帖子转发至组织帖子栏目	2015-12-23 15:35:26 +08:00
_course_show_old.html.erb	讨论区单个帖子页面的二级回复	2015-10-12 17:19:55 +08:00
_form.html.erb	修正课程讨论区样式。修正项目讨论区被影响的样式	2015-03-26 15:55:07 +08:00
_form_course.html.erb	KE引用统一使用import_ke	2015-12-06 15:03:36 +08:00
_form_project.html.erb	项目讨论区样式改成方块样式	2015-12-24 09:46:18 +08:00
_join_org_subfield_menu.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_new_topic.html.erb	课程讨论区代码重构	2015-04-29 14:29:03 +08:00
_project_show.html.erb	项目讨论区样式改成方块样式	2015-12-24 09:46:18 +08:00
_reply_message.html.erb	讨论区单个帖子的二级回复显示不对	2015-10-16 10:42:07 +08:00
_show_org_subfields.html.erb	Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq	2015-12-24 10:40:00 +08:00
edit.html.erb	课程讨论区编辑帖子报错	2015-10-20 15:15:18 +08:00
get_subfield_on_click_org.js.erb	Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq	2015-12-24 10:40:00 +08:00
join_org_subfield.js.erb	Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq	2015-12-24 10:40:00 +08:00
join_org_subfields.js.erb	Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq	2015-12-24 10:40:00 +08:00
new.html.erb	课程讨论区代码重构	2015-04-29 14:29:03 +08:00
quote.js.erb	转换为remote js	2015-12-14 17:13:57 +08:00
reply.js.erb	转换为remote js	2015-12-14 17:13:57 +08:00
show.html.erb	#898 引用回帖不转义的问题	2014-08-12 10:24:27 +08:00