cxt d72aa3a93c Merge branch 'develop' into cxt_course ... Conflicts: app/controllers/homework_common_controller.rb app/views/student_work/show.js.erb public/javascripts/application.js public/stylesheets/base.css public/stylesheets/public_new.css		2016-03-17 15:27:52 +08:00
..
_course_new.html.erb	1、修改无跳转的href链接为javascript:void(0)	2015-04-15 14:53:07 +08:00
_course_show.html.erb	课程导语发送这改成课堂使者	2016-03-17 15:12:28 +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	项目/课程帖子发送弹窗样式修改	2015-12-28 17:03:13 +08:00
_org_subfield_show.html.erb	Merge branch 'develop' into ouyang	2016-02-02 15:51:18 +08:00
_project_new_topic.html.erb	课程讨论区代码重构	2015-04-29 14:29:03 +08:00
_project_show.html.erb	Merge branch 'develop' into ouyang	2016-02-02 15:51:18 +08:00
_reply_message.html.erb	0	2016-03-11 14:39:17 +08:00
_show_org_subfields.html.erb	1.权限管理问题	2015-12-30 17:45:15 +08:00
edit.html.erb	提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子	2016-03-17 15:03:34 +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	修改kindeditor的工具栏	2016-01-29 16:55:07 +08:00
reply.js.erb	修改kindeditor的工具栏	2016-01-29 16:55:07 +08:00
show.html.erb	帖子发送到组织资源栏目，同时增加增删查改功能	2015-12-30 15:46:01 +08:00