ouyangxuhua 2076c9b449 Merge branch 'develop' into dev_hjq ... Conflicts: app/controllers/organizations_controller.rb app/views/layouts/_footer.html.erb app/views/layouts/base_org.html.erb app/views/organizations/_org_activities.html.erb db/schema.rb public/stylesheets/new_user.css public/stylesheets/org.css public/stylesheets/public.css		2015-12-28 15:32:03 +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	动态的展开更多改成点击展开更多	2015-12-22 15:14:03 +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
_project_message_edit.html.erb	编辑项目帖子样式改成方块样式	2015-12-24 11:58:00 +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-24 09:46:18 +08:00
_project_show_detail.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	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-17 15:14:52 +08:00
show.js.erb	课程讨论区的展开更多不可用	2015-12-18 15:02:36 +08:00