Commit Graph

31 Commits

Author SHA1 Message Date
yanxd 79e01adb91 aa 2014-01-17 08:29:36 +08:00
yanxd 3d2c0ba721 add activityBox to project/course/contest html 2014-01-13 08:23:35 +08:00
nieguanghui adf8a7bc92 修改课程活跃度排序方式,解决课程列表文件链接错误 2013-11-09 08:26:23 +08:00
huangjingquan 534c252bcb 修改了课程列表样式,部分国际化 2013-11-08 15:59:08 +08:00
huangjingquan 6e9f3d53e5 新增一个user列表页面 2013-11-08 11:25:33 +08:00
nieguanghui 50b91e3942 修改按钮样式,增加附件过滤 2013-11-07 15:58:15 +08:00
yanxd 369e5eccc0 member_list ,group by roles in course#show 2013-10-31 16:52:06 +08:00
nieguanghui 5ce9bcdb2c 解决竞赛,需求,作业列表搜索bug 2013-10-21 21:16:41 +08:00
nieguanghui 17a4f14f2a 修复课程和项目搜索bug 2013-10-15 16:29:35 +08:00
huangjingquan 9c0b68460a 修改课程与企业样式 2013-09-30 09:42:13 +08:00
huangjingquan b19ed67d79 新的课程
修改了一些bug
2013-09-29 19:46:59 +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 466922d13b 修改了上次会议提出的几点 2013-09-16 08:49:39 +08:00
huangjingquan 261c3fc337 new version 2013-09-12 10:41:15 +08:00
nieguanghui 68145ef5f7 优化排序显示,修改搜索页面显示 2013-09-10 21:02:29 +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
nieguanghui fa27d3bf32 增加项目和用户的排序功能 2013-08-28 09:34:54 +08:00
william d62ad9e863 给tag search结果添加了分页。 2013-08-19 17:28:59 +08:00
fanqiang 988e71d193 修改列表在英文显示中的问题,修改需求列表中的细节问题 2013-08-12 21:03:03 +08:00
huangjingquan 12090cdd80 修改 project-活动里面》》改成竖线 2013-08-12 20:51:21 +08:00
fanqiang a3addb517c 修改列表中搜索框位置,留言删除时提示是否删除 2013-08-12 20:43:18 +08:00
nieguanghui c00575ce84 修改新建项目显示,优化列表显示速度 2013-08-12 17:11:41 +08:00
zhangyang 85a23c468e 添加“新建项目”;调整“新建项目”布局 2013-08-07 15:29:24 +08:00
nieguanghui df93c78490 增加项目,需求搜索, 2013-08-06 21:43:06 +08:00
huangjingquan 70b211e355 first commit 2013-08-01 10:33:49 +08:00