Commit Graph

28 Commits

Author SHA1 Message Date
xianbo ca0f63a817 del the link of .head portrait 2013-11-01 15:48:23 +08:00
baiyu 39c45dff30 1、修改了注册里的问题
2、作业名称改为靠左
3、修改了提交作业、参加竞赛等混乱
4、修改了top bar的字体大小
2013-10-09 16:41:02 +08:00
baiyu 2a9cb28c4e 1、修改了国际化
2、增加了课程“年度”“学期”
3、主讲教师显示bug
2013-09-30 11:02:04 +08:00
william 61e4021625 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
	app/controllers/bids_controller.rb
	app/views/bids/_history.html.erb
	app/views/bids/_project_list.html.erb
	app/views/bids/show.html.erb
	config/locales/zh.yml
	config/routes.rb
	lib/redmine.rb
2013-09-24 09:52:08 +08:00
william 7d919fd3c3 Merge branch 'liuping' into develop
Conflicts:
	app/helpers/bids_helper.rb
	app/views/bids/_project_list.html.erb
	app/views/bids/show.html.erb
	config/locales/zh.yml
	db/schema.rb
2013-09-24 09:14:21 +08:00
xianbo 8ff8d0f4d4 modify some little bug && merge handle 2013-09-23 21:47:07 +08:00
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
william dcbaf1c02b 增加需求结束方法。 2013-09-23 20:12:32 +08:00
baiyu 4fb040bc61 modify register bug 2013-09-23 16:42:19 +08:00
huangjingquan 960b59c807 修改了部分小bug 2013-09-16 10:56:37 +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
kaizheng f077fd397b 字体修复 2013-09-02 13:07:23 +08:00
william bb96536a1e 1.完全重写了tag搜索页面的显示方式,修复了由于分页引起的bug;
2.给需求添加了赞和踩;
2013-08-28 20:36:27 +08:00
kaizheng 0d447cae2c 活动显示分类国际化,需求反馈图标引用、删除国际化,留言图标引用、删除国际化 2013-08-27 16:17:52 +08:00
xianbo 89150e8930 modify some little bug 2013-08-24 16:32:05 +08:00
baiyu 3e711de070 修改国际化 2013-08-22 22:07:31 +08:00
baiyu 074e8adfdd 修改需求页面的一些细节,修改了更新问题的权限,现在更新问题的角色包括超级管理员,管理员,问题创建者,问题指派人员 2013-08-22 20:26:56 +08:00
kaizheng 997e4a1751 稍该国际化。 2013-08-21 16:53:40 +08:00
baiyu 96dfe0a6da 修改需求列表 2013-08-20 22:05:11 +08:00
baiyu 1290a008fc 修改新建需求界面 2013-08-20 16:32:45 +08:00
fanqiang 84b5e61c55 修改留言的引用功能 2013-08-15 09:54:08 +08:00
kaizheng b8a3d3f673 把现有需求国际化 2013-08-09 11:24:42 +08:00
fanqiang bb5052cf30 修改了用户活动,可以查看关注好友的活动,并且将需求加入到活动中
修复了一些需求中的BUG
2013-08-05 22:47:01 +08:00
fanqiang 7949e1166c 添加备注 2013-08-04 10:59:25 +08:00
fanqiang 760a286746 完善需求功能,美化需求列表 2013-08-01 20:47:00 +08:00
huangjingquan 70b211e355 first commit 2013-08-01 10:33:49 +08:00