Commit Graph

161 Commits

Author SHA1 Message Date
huangjingquan f15619d99d 样式 2013-11-05 16:42:03 +08:00
huangjingquan 2a4539dc2c 几个主要页面样式 2013-11-05 12:49:57 +08:00
huangjingquan b9b0b06185 修改了一些链接bug 2013-11-05 10:58:23 +08:00
baiyu 231d1f2c4b 增加样式修改了各个模块导航条颜色 2013-11-05 09:17:36 +08:00
huangjingquan c8427fe61e 修改了作业、项目、课程页面 2013-11-04 20:51:47 +08:00
baiyu 20c2feef30 增加了“项目门户”的当前位置导航、样式、配套的超链接 2013-11-04 20:18:44 +08:00
huangjingquan 8ee5381e44 修改了用户个人主页样式 2013-11-04 16:07:31 +08:00
huangjingquan 27299586c2 修改了top——mune 2013-11-04 15:20:22 +08:00
yanxd 19b983e103 move flash message to top on base_project 2013-11-02 14:17:15 +08:00
yanxd 5d431670a5 add new css to nyan.css 2013-11-02 13:41:46 +08:00
yanxd 6dec8a9312 share previews 2013-10-25 15:46:14 +08:00
xianbo a50aff3fb4 1.add special reward
2.give a root controller in bid controller && give the administrator the root can change the reward who is deadine.
2013-10-24 20:36:57 +08:00
yanxd 4bef2eee24 course can be shared files by project's member 2013-10-22 09:02:48 +08:00
nieguanghui b04fe3d1bb 增加项目评分 个人评分 ,个人在项目中的评分机制 2013-10-21 09:42:09 +08:00
yanxd 5d0b5812b3 share completed with fq, xianbo 2013-10-21 08:57:55 +08:00
baiyu 9fa9aa0fb8 “返回课程”“返回主页”按钮变色。改边距,边框变圆润 2013-10-17 16:22:26 +08:00
baiyu 1be0a7d23f 修改了“返回个人主页”和“返回课程”,修改了样式 2013-10-16 22:02:05 +08:00
nieguanghui 17a4f14f2a 修复课程和项目搜索bug 2013-10-15 16:29:35 +08:00
yanxd ec63fc41bb add link in project/course list page, joinBUtton renamed. 2013-10-15 14:46:20 +08:00
yanxd e1d8c8a992 remove nyan css & move another file 2013-10-15 11:06:19 +08:00
yanxd 20883b92a5 add button css, fix js bug, add create project to push homework. 2013-10-14 21:45:10 +08:00
baiyu 13a2cfe644 修改了fork页面,增加了教师超链接 2013-10-10 23:02:15 +08:00
baiyu 39c45dff30 1、修改了注册里的问题
2、作业名称改为靠左
3、修改了提交作业、参加竞赛等混乱
4、修改了top bar的字体大小
2013-10-09 16:41:02 +08:00
baiyu ca6f69a0d0 1 2013-10-07 22:32:39 +08:00
baiyu 2a9cb28c4e 1、修改了国际化
2、增加了课程“年度”“学期”
3、主讲教师显示bug
2013-09-30 11:02:04 +08:00
fanqiang 838894a19c 修改了需求评分功能,以及作业的提交 2013-09-29 19:58:57 +08:00
huangjingquan b19ed67d79 新的课程
修改了一些bug
2013-09-29 19:46:59 +08:00
xianbo a88cb3ad2b fix nature 2013-09-28 10:51:28 +08:00
william da82a630e9 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into tmp1
Conflicts:
	app/controllers/bids_controller.rb
	app/helpers/bids_helper.rb
	config/locales/zh.yml
	db/schema.rb
2013-09-28 10:36:44 +08:00
william a8c3808053 优化需求结束的展示方式。另外需求的货币奖励方式暂缺。 2013-09-28 10:00:40 +08:00
william 0be9de3a17 tag搜索中相关tag改成只显示10个,另外统一了按钮风格(除去留言按钮) 2013-09-27 16:02:49 +08:00
william 2079c87362 增加tag删除。 2013-09-27 14:58:51 +08:00
baiyu 6e4e5ec577 修改了“顶”和“踩”的图标 2013-09-26 21:01:17 +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
baiyu 4fb040bc61 modify register bug 2013-09-23 16:42:19 +08:00
huangjingquan 278cb57ab9 修改了项目里面一些bug 2013-09-23 13:35:29 +08:00
baiyu 6ce27271e3 修改了身份
增加了职称、学号
2013-09-23 09:41:36 +08:00
huangjingquan 3536883248 课程合并 2013-09-23 08:44:48 +08:00
baiyu a7b500f5e7 修正了“注册”和“我的账号”的显示格式 2013-09-16 21:56:12 +08:00
huangjingquan 466922d13b 修改了上次会议提出的几点 2013-09-16 08:49:39 +08:00
baiyu 2768c935be 1、增加了“我的状态” 2013-09-14 17:22:44 +08:00
baiyu 313e66537e 增加了“地区” 2013-09-13 22:47:14 +08:00
kaizheng 4684217097 解决英文页面项目列表中提交时间分行的问题,以及修复缺失的国际化 2013-09-12 21:09:44 +08:00
baiyu 3ae85e93ad 1、修复了丢失的国际化
2、增加了性别
2013-09-12 20:19:49 +08:00
huangjingquan 261c3fc337 new version 2013-09-12 10:41:15 +08:00
baiyu a2cc191a4e 1、增加“我的账号”里的了工作单位
2、增加了“注册”里的“身份”
2013-09-12 08:38:47 +08:00
kaizheng 7283131688 项目配置模块英文显示页面修复 2013-09-09 20:31:46 +08:00
huangjingquan 83acda2781 修改了500界面显示 2013-09-05 20:52:22 +08:00
huangjingquan 76ea03eae6 修改了500(internet error)显示页面! 2013-09-05 10:15:40 +08:00
yanxd 43d43f22c0 fix icon position on issues/new 2013-09-03 08:37:16 +08:00