cxt 78ca68b5e3 Merge branch 'cxt_course' into develop ... Conflicts: public/stylesheets/css/moduel.css public/stylesheets/css/public.css		2016-11-04 16:15:56 +08:00
..
_base_ad.html.erb	…
_base_college_header.html.erb	…
_base_enterprise_header.html.erb	…
_base_feedback.html.erb	数据为空时，帮助中心，问题和建议报500	2016-10-09 16:55:41 +08:00
_base_footer.html.erb	footer部分logo与链接替换更新	2016-08-29 15:28:32 +08:00
_base_footer_new.html.erb	…
_base_footer_public.html.erb	数据为空时，帮助中心，问题和建议报500	2016-10-09 16:55:41 +08:00
_base_header.html.erb	Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq	2015-08-13 18:34:29 +08:00
_base_header_new.html.erb	解决图标点两次的问题	2015-08-24 11:11:45 +08:00
_base_home_menu.html.erb	…
_base_homework_attach.html.erb	…
_base_project_top.html.erb	Merge branch 'dev_newproject' into develop	2016-11-01 16:34:54 +08:00
_base_softapplication_index_top_content.html.erb	…
_base_softapplication_top_content.html.erb	…
_board_children_list.html.erb	游客身份，隐藏讨论区二级栏目新建帖子的入口	2016-10-24 14:10:37 +08:00
_bootstrap_base_footer.html.erb	…
_bootstrap_base_header.html.erb	…
_course_base_info.html.erb	班级-多重角色的显示错误：当一个成员的身份是：助教和学生时，角色切换按钮显示的是“学生身份”和“教师身份” 正确的应该是“学生身份”和“助教身份”	2016-10-13 14:14:32 +08:00
_footer.html.erb	数据为空时，帮助中心，问题和建议报500	2016-10-09 16:55:41 +08:00
_footer_show.html.erb	隐藏项目信息之 新用户注册但是未完善资料页面修改	2016-08-31 15:14:55 +08:00
_forbidden_new_feedback.html.erb	数据为空时，帮助中心，问题和建议报500	2016-10-09 16:55:41 +08:00
_group_children_list.html.erb	添加分班无反应	2016-10-28 18:16:35 +08:00
_homepage_left_course_list.html.erb	首页左侧班级和项目列表的收藏功能	2016-08-25 11:30:47 +08:00
_homepage_left_project_list.html.erb	首页左侧班级和项目列表的收藏功能	2016-08-25 11:30:47 +08:00
_join_exit_project.html.erb	项目base功能添加	2016-09-23 10:36:47 +08:00
_logined_header.html.erb	隐藏非项目的时候图像中禁掉我的课程	2016-11-02 15:10:21 +08:00
_logined_header_show.html.erb	数据为空时，帮助中心，问题和建议报500	2016-10-09 16:55:41 +08:00
_message_loading.html.erb	消息弹窗的显示	2016-06-03 16:28:11 +08:00
_new_feedback.html.erb	数据为空时，帮助中心，问题和建议报500	2016-10-09 16:55:41 +08:00
_new_footer.html.erb	footer部分logo与链接替换更新	2016-08-29 15:28:32 +08:00
_new_header.html.erb	去掉项目消息提示	2015-08-15 16:11:40 +08:00
_no_content.html.erb	…
_org_courses.html.erb	组织栏目中的链接的url更新	2016-03-10 12:47:10 +08:00
_org_custom_footer.html.erb	数据为空时，帮助中心，问题和建议报500	2016-10-09 16:55:41 +08:00
_org_projects.html.erb	组织栏目中的链接的url更新	2016-03-10 12:47:10 +08:00
_org_subdomain_footer.html.erb	数据为空时，帮助中心，问题和建议报500	2016-10-09 16:55:41 +08:00
_point_browser.html.erb	…
_project_info.html.erb	样式调整、线下作业的作品评分、导出作业成绩报500	2016-07-08 15:02:50 +08:00
_show_messages_list.html.erb	消息列表问题	2016-09-09 17:44:41 +08:00
_syllabus_base_info.html.erb	课程信息单词折行	2016-08-13 16:27:29 +08:00
_syllabus_edit_info.html.erb	新版课程大纲	2016-07-22 10:20:28 +08:00
_syllabus_eng_name.html.erb	“课程名称”不显示，英文名称为空时不显示“课程英文名称”	2016-08-31 14:33:29 +08:00
_syllabus_info.html.erb	“课程名称”不显示，英文名称为空时不显示“课程英文名称”	2016-08-31 14:33:29 +08:00
_syllabus_teacher_list.html.erb	教师团队的删除判断、“增加教师”链接跳转时展开添加成员	2016-09-23 18:34:03 +08:00
_syllabus_title.html.erb	“课程名称”不显示，英文名称为空时不显示“课程英文名称”	2016-08-31 14:33:29 +08:00
_tag.html.erb	…
_tag_name.html.erb	…
_unlogin_header.html.erb	数据为空时，帮助中心，问题和建议报500	2016-10-09 16:55:41 +08:00
_upload_avatar.html.erb	课程和项目的头像点击可编辑	2016-08-26 14:31:14 +08:00
_user_brief_introduction.html.erb	首页左侧栏	2016-08-04 11:05:34 +08:00
_user_courses.html.erb	侧导航调整	2016-09-23 16:47:12 +08:00
_user_courses_list.html.erb	网站首页、个人主页、项目、课程等页面header项目/课程下拉框按照最新的动态更新时间排序	2015-08-13 11:08:02 +08:00
_user_fans_list.html.erb	…
_user_homework_list.html.erb	…
_user_project_list.html.erb	网站首页、个人主页、项目、课程等页面header项目/课程下拉框按照最新的动态更新时间排序	2015-08-13 11:08:02 +08:00
_user_projects.html.erb	首页左侧班级和项目列表的收藏功能	2016-08-25 11:30:47 +08:00
_user_watch_btn.html.erb	个人主页调整	2016-10-21 08:55:17 +08:00
_user_watch_list.html.erb	修改个人主页---关注	2015-07-30 09:39:38 +08:00
admin.html.erb	…
base.html.erb	css文件替换	2016-06-24 09:30:46 +08:00
base.html_old.erb	…
base_.html.erb	…
base_admin.html.erb	单位名称列表功能代码	2016-07-29 20:48:36 +08:00
base_bids.html.erb	…
base_contest.html.erb	…
base_courses.html.erb	学生身份成员应该在左侧导航处看到讨论区新建帖子的入口	2016-10-28 17:58:16 +08:00
base_forums.html.erb	修复：项目动态附件，组织列表，贴吧列表交流，贴吧吧主，贴吧发帖人，贴吧最后回复，详情页面问题跟踪，项目动态的指派的地方的用户改为显示用户姓名	2016-09-14 10:42:30 +08:00
base_homework.html.erb	火狐MathJax显示公式错误，还是不能不用图形字体	2015-11-18 10:55:55 +08:00
base_memos.html.erb	css文件替换	2016-06-24 09:30:46 +08:00
base_newcontest.html.erb	…
base_old.html.erb	…
base_opensource_p.html.erb	…
base_org.html.erb	组织历史版本删除功能	2016-10-14 14:46:48 +08:00
base_org2.html.erb	数据为空时，帮助中心，问题和建议报500	2016-10-09 16:55:41 +08:00
base_org_custom.html.erb	组织logo点击可编辑	2016-08-29 16:19:06 +08:00
base_org_newstyle.html.erb	数据为空时，帮助中心，问题和建议报500	2016-10-09 16:55:41 +08:00
base_organization.html.erb	数据为空时，帮助中心，问题和建议报500	2016-10-09 16:55:41 +08:00
base_projects.html.erb	项目收藏结构修改	2016-10-25 14:05:07 +08:00
base_stores.html.erb	…
base_sub_domain.html.erb	宽度改成1000二级目录模式二样式调整	2016-06-07 10:17:16 +08:00
base_syllabus.html.erb	课程大纲教师团队的管理	2016-09-23 09:22:47 +08:00
base_tags.html.erb	Merge branch 'develop' into cs_optimize_txz	2016-07-05 15:38:56 +08:00
base_users.html.erb	火狐MathJax显示公式错误，还是不能不用图形字体	2015-11-18 10:55:55 +08:00
base_users_new.html.erb	超级管理员看他人的项目列表500问题	2016-10-08 16:04:35 +08:00
base_wechat.html.erb	绑定提交改为ajax	2016-03-01 16:56:37 +08:00
base_welcome.html.erb	css文件替换	2016-06-24 09:30:46 +08:00
bootstrap_base.html.erb	…
clear_base.html.erb	个人主页	2016-10-19 18:03:59 +08:00
contest_base.html.erb	火狐MathJax显示公式错误，还是不能不用图形字体	2015-11-18 10:55:55 +08:00
course_base.html.erb	css文件替换	2016-06-24 09:30:46 +08:00
left.html.erb	…
login.html.erb	Merge branch 'develop' into cs_optimize_txz	2016-07-05 15:38:56 +08:00
mailer.html.erb	…
mailer.text.erb	…
new_base.html.erb	隐藏非项目信息	2016-08-31 10:30:23 +08:00
new_base_user.html.erb	启动匿评、关闭匿评的提示	2016-11-02 16:46:47 +08:00
new_base_user_show.html.erb	修复：强制修改页面，左侧编辑个人资料可用	2016-09-09 15:03:46 +08:00
right.html.erb	…
static_base.html.erb	我的作业	2016-08-05 16:12:53 +08:00
system_log.html.erb	…
users_base.html.erb	css文件替换	2016-06-24 09:30:46 +08:00