daiao 911a769670 Merge branch 'develop' into dev_shcool ... Conflicts: app/models/applied_message.rb		2016-07-29 22:05:56 +08:00
..
_base_ad.html.erb	…
_base_college_header.html.erb	…
_base_enterprise_header.html.erb	…
_base_feedback.html.erb	增加关闭反馈功能	2015-09-24 11:31:07 +08:00
_base_footer.html.erb	去掉首页底部留白和不对齐	2015-04-23 17:43:10 +08:00
_base_footer_new.html.erb	个人主页	2015-07-09 15:27:49 +08:00
_base_footer_public.html.erb	帮助中心的弹框	2016-06-06 15:03:21 +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	完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签	2015-03-10 09:45:36 +08:00
_base_softapplication_index_top_content.html.erb	…
_base_softapplication_top_content.html.erb	…
_bootstrap_base_footer.html.erb	首页国际化	2015-01-30 10:26:26 +08:00
_bootstrap_base_header.html.erb	将setting中的domain合并到host配置中	2015-05-14 21:40:34 +08:00
_course_base_info.html.erb	Merge branch 'cxt_course' into develop	2016-07-29 21:54:33 +08:00
_footer.html.erb	帮助中心的弹框	2016-06-06 15:03:21 +08:00
_join_exit_project.html.erb	局部刷新	2016-07-29 19:42:21 +08:00
_logined_header.html.erb	班级学生列表导航栏下拉框错位调整	2016-07-12 16:45:04 +08:00
_message_loading.html.erb	消息弹窗的显示	2016-06-03 16:28:11 +08:00
_new_feedback.html.erb	1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮	2016-06-30 16:08:36 +08:00
_new_footer.html.erb	1、修改版权	2015-03-17 17:04:18 +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	组织新base框架	2016-05-30 14:23:52 +08:00
_org_projects.html.erb	组织栏目中的链接的url更新	2016-03-10 12:47:10 +08:00
_org_subdomain_footer.html.erb	宽度改成1000二级目录模式二样式调整	2016-06-07 10:17:16 +08:00
_point_browser.html.erb	jquery-js找不到报错	2015-05-12 10:12:00 +08:00
_project_info.html.erb	样式调整、线下作业的作品评分、导出作业成绩报500	2016-07-08 15:02:50 +08:00
_show_messages_list.html.erb	过滤掉消息中的html	2016-07-12 16:21:30 +08:00
_syllabus_base_info.html.erb	样式调整	2016-07-22 17:13:40 +08:00
_syllabus_edit_info.html.erb	新版课程大纲	2016-07-22 10:20:28 +08:00
_syllabus_eng_name.html.erb	编辑课程的英文名称时输入框不清空	2016-07-22 16:38:09 +08:00
_syllabus_info.html.erb	新版课程大纲	2016-07-22 10:20:28 +08:00
_syllabus_teacher_list.html.erb	新版课程大纲	2016-07-22 10:20:28 +08:00
_syllabus_title.html.erb	课程的回复和名称的编辑	2016-07-22 16:00:56 +08:00
_tag.html.erb	…
_tag_name.html.erb	…
_unlogin_header.html.erb	课程大纲	2016-07-01 11:11:53 +08:00
_user_brief_introduction.html.erb	个人主页个性签名增加自动识别url	2016-06-13 15:29:15 +08:00
_user_courses.html.erb	课程大纲的删除和课程大纲描述的删除	2016-07-01 16:25:52 +08:00
_user_courses_list.html.erb	网站首页、个人主页、项目、课程等页面header项目/课程下拉框按照最新的动态更新时间排序	2015-08-13 11:08:02 +08:00
_user_fans_list.html.erb	个人主页	2015-07-09 15:27:49 +08:00
_user_homework_list.html.erb	1、实现作业列表展示页面	2015-05-19 17:12:43 +08:00
_user_project_list.html.erb	网站首页、个人主页、项目、课程等页面header项目/课程下拉框按照最新的动态更新时间排序	2015-08-13 11:08:02 +08:00
_user_projects.html.erb	Merge branch 'yuanke' into develop	2016-05-06 11:35:27 +08:00
_user_watch_btn.html.erb	添加关注与取消关注	2015-08-29 14:34:59 +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	附件上传国际化：修改页面一些bug：用户主页个人得分身份信息修改	2015-03-19 17:21:11 +08:00
base_courses.html.erb	删除班级留言时左侧导航栏的样式问题	2016-07-27 10:20:27 +08:00
base_forums.html.erb	css文件替换	2016-06-24 09:30:46 +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	张申修改的bug	2015-07-06 11:42:26 +08:00
base_old.html.erb	…
base_opensource_p.html.erb	新版项目模块国际化，目前完成各项目主页，项目动态，项目评分	2015-03-11 17:23:38 +08:00
base_org.html.erb	引入project.css	2016-07-15 09:51:14 +08:00
base_org2.html.erb	Merge branch 'huang_temp2' into develop	2016-06-03 08:30:31 +08:00
base_org_custom.html.erb	宽度改成1000二级目录模式二样式调整	2016-06-07 10:17:16 +08:00
base_org_newstyle.html.erb	组织模块访问统计修改	2016-04-19 09:18:58 +08:00
base_organization.html.erb	css文件替换	2016-06-24 09:30:46 +08:00
base_projects.html.erb	项目邀请码直接数据库读取，权限修改	2016-07-25 15:22:34 +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-07-22 18:20:11 +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	Merge branch 'develop' into cs_optimize_txz	2016-07-05 15:38:56 +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	…
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	删除邮件发送时出现《"亲爱的Trustie用户，您好！"》	2015-03-19 09:37:37 +08:00
mailer.text.erb	…
new_base.html.erb	Merge branch 'develop' into cs_optimize_txz	2016-07-05 15:38:56 +08:00
new_base_user.html.erb	Merge branch 'develop' into rep_quality	2016-07-29 21:39:00 +08:00
right.html.erb	…
static_base.html.erb	css文件替换	2016-06-24 09:30:46 +08:00
system_log.html.erb	…
users_base.html.erb	css文件替换	2016-06-24 09:30:46 +08:00