xianbo 7da2f421e0 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop ... Conflicts: app/views/bids/_new.html.erb app/views/projects/feedback.html.erb		2013-11-08 15:50:28 +08:00
..
_base_college_header.html.erb	修改了删除“我的账号”后的小问题	2013-10-30 21:22:44 +08:00
_base_enterprise_header.html.erb	修改了删除“我的账号”后的小问题	2013-10-30 21:22:44 +08:00
_base_footer.html.erb	修改了“footer",，每天新闻增加了下划线	2013-08-12 15:52:17 +08:00
_base_header.html.erb	几个主要页面样式	2013-11-05 12:49:57 +08:00
_base_home_menu.html.erb	新的课程	2013-09-29 19:46:59 +08:00
_tag.html.erb	test	2013-08-22 16:42:13 +08:00
_tag_name.html.erb	test	2013-08-22 16:42:13 +08:00
admin.html.erb	first commit	2013-08-01 10:33:49 +08:00
base.html.erb	修改了top——mune	2013-11-04 15:20:22 +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_bids.html.erb	各个列表添加当前位置	2013-11-08 10:29:29 +08:00
base_contest.html.erb	modify show of some style	2013-11-08 15:49:08 +08:00
base_courses.html.erb	各个列表添加当前位置	2013-11-08 10:29:29 +08:00
base_homework.html.erb	fix the show out of the frame and the location of show	2013-11-07 19:14:57 +08:00
base_old.html.erb	修改了tag的显示	2013-08-12 20:18:10 +08:00
base_projects.html.erb	fix the show out of the frame and the location of show	2013-11-07 19:14:57 +08:00
base_tags.html.erb	modify shoew of project	2013-11-07 17:04:37 +08:00
base_users.html.erb	页面链接	2013-11-06 10:31:20 +08:00
left.html.erb	稍该国际化	2013-08-20 09:39:36 +08:00
mailer.html.erb	first commit	2013-08-01 10:33:49 +08:00
mailer.text.erb	first commit	2013-08-01 10:33:49 +08:00
right.html.erb	完善tag的搜索功能。赞的显示优化。	2013-08-10 22:54:16 +08:00