Commit Graph

64 Commits

Author SHA1 Message Date
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
baiyu 4fb040bc61 modify register bug 2013-09-23 16:42:19 +08:00
huangjingquan 466922d13b 修改了上次会议提出的几点 2013-09-16 08:49:39 +08:00
fanqiang 805ad6600b 添加了提交作业 2013-09-13 21:52:24 +08:00
huangjingquan 261c3fc337 new version 2013-09-12 10:41:15 +08:00
xianbo 1e7d127998 new course table 2013-09-06 16:39:38 +08:00
nieguanghui 7490806bf3 默认排序方式更改 2013-09-06 09:25:02 +08:00
huangjingquan 55499db0ab 修改了英文版新闻评论被挤换行问题
英文版项目setting显示超出
2013-09-04 22:19:59 +08:00
huangjingquan c4df893eab 修改了tabs页面,字体大小 2013-09-02 12:49:17 +08:00
zhangyang 4d82cad51d move 2013.8.29 2013-08-30 09:34:21 +08:00
william 0c22d409fc 添加写project_status和user_status两表的方法,
在关注中写这2个表,
重构了tag的过滤方法,
拿掉了user_extension.rb.
2013-08-27 11:27:25 +08:00
william 6f54e1680d 修复了tag查询的问题;tag样式的显示 2013-08-13 15:20:48 +08:00
william 80e74e4dd7 修改了一些赞的bug,添加了显示所有tag的功能。 2013-08-08 22:25:32 +08:00
huangjingquan 70b211e355 first commit 2013-08-01 10:33:49 +08:00