xianbo 806fae7b19 Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop ... Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css		2013-09-23 20:18:03 +08:00
..
_base_footer.html.erb	修改了“footer",，每天新闻增加了下划线	2013-08-12 15:52:17 +08:00
_base_header.html.erb	new version	2013-09-12 10:41:15 +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	修正base底部显示	2013-08-04 11:08:30 +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	修改了日历和版本库bug	2013-09-23 15:12:06 +08:00
base_courses.html.erb	修改了项目里面一些bug	2013-09-23 13:35:29 +08:00
base_homework.html.erb	课程合并	2013-09-23 08:44:48 +08:00
base_old.html.erb	修改了tag的显示	2013-08-12 20:18:10 +08:00
base_projects.html.erb	new version	2013-09-12 10:41:15 +08:00
base_tags.html.erb	添加tag框架显示	2013-08-13 17:18:28 +08:00
base_users.html.erb	Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop	2013-09-23 20:18:03 +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