huang c159bb2c48 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: app/controllers/projects_controller.rb app/views/issues/show.html.erb app/views/layouts/base_projects.html.erb app/views/projects/_form.html.erb app/views/projects/new.html.erb app/views/projects/show.html.erb		2015-03-06 15:23:42 +08:00
..
_base_ad.html.erb	实现<去存储过程功能，并修改打分的表更新>	2014-12-31 08:48:14 +08:00
_base_college_header.html.erb	修改了删除“我的账号”后的小问题	2013-10-30 21:22:44 +08:00
_base_enterprise_header.html.erb	#1357	2014-08-18 10:16:34 +08:00
_base_feedback.html.erb	新项目及用户反馈框的修改！！	2015-03-06 14:55:21 +08:00
_base_footer.html.erb	将google统计换为了百度统计	2015-02-06 10:15:18 +08:00
_base_header.html.erb	用户反馈弹框模块！	2015-01-10 15:39:02 +08:00
_base_home_menu.html.erb	#1357	2014-08-18 10:16:34 +08:00
_base_homework_attach.html.erb	修改部分页面导航栏点击课程实践报404	2014-12-11 15:51:01 +08:00
_base_softapplication_index_top_content.html.erb	修改竞赛相关模块的标题栏信息	2014-11-26 14:49:55 +08:00
_base_softapplication_top_content.html.erb	#1712点击打开某竞赛作品，网页名显示为托管项目的名称	2014-12-15 15:13:11 +08:00
_bootstrap_base_footer.html.erb	首页国际化	2015-01-30 10:26:26 +08:00
_bootstrap_base_header.html.erb	课程后增加课程作业的快捷栏	2014-11-14 15:04:35 +08:00
_join_exit_project.html.erb	新项目及用户反馈框的修改！！	2015-03-06 14:55:21 +08:00
_no_content.html.erb	1、 网站中的搜索几乎都没有搜索后的提示语，这里应该加提示语，提示重新搜索。	2013-12-19 19:54:39 +08:00
_tag.html.erb	修改标签的显示js	2014-11-27 16:44:14 +08:00
_tag_name.html.erb	test	2013-08-22 16:42:13 +08:00
_user_courses_list.html.erb	优化base_head代码	2014-11-20 09:15:29 +08:00
_user_homework_list.html.erb	优化base_head代码	2014-11-20 09:15:29 +08:00
_user_project_list.html.erb	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +08:00
admin.html.erb	prepare fix admin/	2013-11-15 10:55:11 +08:00
base.html.erb	去掉首页更新提示	2014-12-31 15:47:43 +08:00
base.html_old.erb	first commit	2013-08-01 10:33:49 +08:00
base_.html.erb	first commit	2013-08-01 10:33:49 +08:00
base_admin.html.erb	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +08:00
base_bids.html.erb	修改页面代码	2014-11-26 10:57:53 +08:00
base_contest.html.erb	修改《新建课程时：课程名中有空格或者特殊符号会提示名称无效,》	2015-01-08 16:16:59 +08:00
base_courses.html.erb	修改问卷调查按钮的样式	2015-01-23 10:19:23 +08:00
base_forums.html.erb	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-09-15 10:58:14 +08:00
base_homework.html.erb	修改个人留言界面，左侧个人信息样式显示不正确	2015-01-29 16:22:26 +08:00
base_memos.html.erb	搜索项目时增加js验证增加	2015-01-30 11:00:18 +08:00
base_newcontest.html.erb	Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh	2015-01-31 10:10:28 +08:00
base_old.html.erb	修改了tag的显示	2013-08-12 20:18:10 +08:00
base_opensource_p.html.erb	修改合并之后的一些小问题	2014-05-05 15:33:24 +08:00
base_projects.html.erb	新项目及用户反馈框的修改！！	2015-03-06 14:55:21 +08:00
base_stores.html.erb	修复部分页面导航丢失问题	2014-07-21 11:14:17 +08:00
base_tags.html.erb	竞赛、课程首页，贴吧动态名字过长显示问题	2014-07-28 15:06:54 +08:00
base_users.html.erb	国际化结构调整	2015-02-09 22:07:21 +08:00
bootstrap_base.html.erb	bootstrap fine tuning.	2014-07-09 15:20:00 +08:00
contest_base.html.erb	增加《作业评分弹窗》《学生列表增加作业评分》两项功能	2014-12-17 17:36:12 +08:00
course_base.html.erb	添加《添加相同组时应该给出相关提示信息》功能	2014-12-19 23:12:32 +08:00
left.html.erb	稍该国际化	2013-08-20 09:39:36 +08:00
mailer.html.erb	< 邮件格式调整>	2015-01-26 15:54:23 +08:00
mailer.text.erb	first commit	2013-08-01 10:33:49 +08:00
project_base.html.erb	修复导航bug	2014-07-22 15:59:35 +08:00
right.html.erb	完善tag的搜索功能。赞的显示优化。	2013-08-10 22:54:16 +08:00
system_log.html.erb	系统日志查看相关代码，资源	2015-01-19 14:09:53 +08:00
users_base.html.erb	修改《修改个人资料页面》bug	2015-01-10 18:01:41 +08:00