Commit Graph

653 Commits

Author SHA1 Message Date
xianbo 1f09bfbab1 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-10-28 20:09:43 +08:00
xianbo e9856b3524 modify the style of the projects witch show 2013-10-28 20:09:15 +08:00
nieguanghui 1f8c10e48a 修复bug 2013-10-28 08:51:15 +08:00
xianbo cbe22e4e60 modify the judge of the nil class of identity in app/views/bids/_project_list.html.erb 2013-10-26 15:04:00 +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
xianbo 2fa6276829 fix natural 2013-10-24 10:13:37 +08:00
nieguanghui 39580a04a2 修复项目列表成员显示bug 2013-10-24 09:46:22 +08:00
xianbo 21ffbe637e Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
	app/views/projects/_project.html.erb
	app/views/projects/member.html.erb
	app/views/users/index.html.erb
	config/locales/zh.yml
	db/schema.rb
	files/2013/10/131007102834__my_course.html.erb
2013-10-24 08:33:07 +08:00
xianbo 2589d429b0 add the project what one watch 2013-10-24 08:24:56 +08:00
yanxd 666806ae28 fixed little bug 2013-10-22 16:15:27 +08:00
yanxd df73f34e71 share linkto better 2013-10-22 14:46:33 +08:00
nieguanghui cf40f9ff02 fix course list bug 2013-10-22 10:02:49 +08:00
yanxd 4bef2eee24 course can be shared files by project's member 2013-10-22 09:02:48 +08:00
nieguanghui 5ce9bcdb2c 解决竞赛,需求,作业列表搜索bug 2013-10-21 21:16:41 +08:00
xianbo 3f4a60b462 fix show 2013-10-21 14:43:22 +08:00
xianbo 5a1bb0f2d4 fix bug in arrange to net 2013-10-21 11:21:07 +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
yanxd dde65a5895 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-10-21 08:52:02 +08:00
baiyu a44713ba6d 修改了需求页面显示 2013-10-19 16:16:54 +08:00
baiyu ecdeaf123e 修改了部分国际化 2013-10-19 15:39:53 +08:00
baiyu 0206d3f2c3 需求里面添加了用户和项目与需求的联系 2013-10-19 09:35:14 +08:00
yanxd e2447b4c88 truncate textilizable 2013-10-18 10:00:06 +08:00
baiyu 9fa9aa0fb8 “返回课程”“返回主页”按钮变色。改边距,边框变圆润 2013-10-17 16:22:26 +08:00
yanxd ab5d8853b5 fixed issue#314 2013-10-17 16:14:35 +08:00
yanxd 081a8e9825 fixed issue#319 2013-10-17 10:31:41 +08:00
baiyu 8ec86a27c4 xuehao 2013-10-16 22:14:49 +08:00
baiyu 5b48826faf 修改了学号显示错误 2013-10-16 22:10:58 +08:00
baiyu 1be0a7d23f 修改了“返回个人主页”和“返回课程”,修改了样式 2013-10-16 22:02:05 +08:00
baiyu 19b030dd23 修改了需求和作业列表显示混乱 2013-10-16 21:46:54 +08:00
yanxd abe52df8d0 Merge remote-tracking branch 'origin/develop' into develop 2013-10-16 21:11:46 +08:00
yanxd 332bc0765d 240 characters or less limited in activity info. ===> projects#show 2013-10-16 21:10:30 +08:00
xianbo 520c5843ce modify homework show and the link of style 2013-10-16 17:02:38 +08:00
yanxd 534457547e Merge remote-tracking branch 'origin/develop' into develop 2013-10-16 10:59:49 +08:00
yanxd 69869a05c9 reverse projects list, add explain to role. 2013-10-16 10:58:21 +08:00
huangjingquan 29e2a4c70b 修改了作业提交时学号显示错误
作业页面增加了内容
2013-10-16 10:53:11 +08:00
huangjingquan 41a74a5254 提示信息国际化 2013-10-16 09:20:37 +08:00
xianbo 5a234e6fb2 add the link of project contributers&&followers count number 2013-10-15 17:11:10 +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
baiyu 8335c111c7 1、修改了“加入课程”位置
2、修改了我的账号里的格式
2013-10-15 09:42:27 +08:00
xianbo 13e7280245 1.modify show of data
2.modify tool bar show when differ user login
2013-10-15 09:40:26 +08:00
huangjingquan 6e10f16c68 添加了注释
修改了作业提交显示错误(显示成需求)
2013-10-14 22:40:34 +08:00
yanxd 20883b92a5 add button css, fix js bug, add create project to push homework. 2013-10-14 21:45:10 +08:00
xianbo 0238001721 modify destroy project and user can't destroy biding_project 2013-10-14 20:57:31 +08:00
xianbo 8c675c2a96 add show about setting about course 2013-10-14 16:38:52 +08:00
xianbo abc163887e fix 2013-10-14 16:38:51 +08:00
fanqiang 2fbf025c2f 调整需求的评价,隐藏个人账户的首选项内容 2013-10-14 10:09:10 +08:00
huangjingquan bcb66f2b32 在个人主页项目里面添加新建按钮 2013-10-13 15:26:41 +08:00
huangjingquan 673850bd03 fix 2013-10-12 17:42:19 +08:00
huangjingquan 19ebd48a95 修改了作业列表无法显示 2013-10-12 17:21:50 +08:00
huangjingquan 00cef03049 修改了个人主页里关注需求全部需求改成只关注的需求 2013-10-12 16:23:25 +08:00
xianbo 2bd110c550 delete the icon show about course 2013-10-12 14:35:19 +08:00
huangjingquan 8082bb456f 为竞赛添加新的页面 2013-10-12 10:45:48 +08:00
yanxd a5cdbc8e92 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-10-12 10:37:37 +08:00
yanxd f1a31c7f6b 提升头像图片显示分辨力 2013-10-12 10:36:50 +08:00
xianbo d3f46adc34 fix 2013-10-12 10:08:45 +08:00
xianbo fd14457446 add delete homework in course 2013-10-12 10:05:31 +08:00
xianbo d7f7ff5fa9 delete homework 2013-10-12 10:05:30 +08:00
huangjingquan 8ce8de09cb 修改了个人主页课程列表 2013-10-12 08:53:45 +08:00
huangjingquan c49209cbfb 将课程和作业分开
作业单独一个tabs
2013-10-11 20:25:24 +08:00
huangjingquan 508eee45f2 修改了加入课程弹框显示错误! 2013-10-11 09:27:07 +08:00
baiyu 6676110b11 修改了教授丢失 2013-10-11 09:05:03 +08:00
baiyu 13a2cfe644 修改了fork页面,增加了教师超链接 2013-10-10 23:02:15 +08:00
huangjingquan 3ff443b7b6 修改了自己的作业不能关注
只能关注别人的作业
2013-10-10 22:45:00 +08:00
huangjingquan 0a5013edd1 修改了作业界面显示
修改了发布作业的时候在个人动态里面显示做(之前显示需求)
2013-10-10 22:36:35 +08:00
fanqiang 962842d841 修改了提交作业数量显示问题,修改了创建需求的种类选择问题 2013-10-10 21:56:27 +08:00
huangjingquan ff21bca683 修改了老师访问学生页面的时候bug 2013-10-10 21:43:49 +08:00
xianbo 956aa3d0c1 remove forum block in course setting 2013-10-10 21:41:42 +08:00
huangjingquan e25425d9a7 用户看别人课程主页时显示问题 2013-10-10 21:33:52 +08:00
nieguanghui 8703709bd0 解决了课程创建时设置私有依旧显示在课程列表的bug 2013-10-10 21:11:42 +08:00
wanglinchun 48a0f2f409 个人主页,课程相关国际化 2013-10-10 17:07:43 +08:00
huangjingquan a0c6a183fe 修改了个人主页的关注需求里面只显示需求不显示作业 2013-10-10 16:04:59 +08:00
xianbo 543279eb84 add course filter 2013-10-10 15:05:27 +08:00
huangjingquan 64cddc8687 修改了课程设置里面bug
角色改成英文
2013-10-10 10:36:56 +08:00
xianbo b0d413a216 modify the admin select 2013-10-10 10:22:32 +08:00
xianbo 677bc4060b fix bug about delete project 2013-10-09 22:31:57 +08:00
xianbo 3b6f0e3d34 modify delete project and user and define a course is a public 2013-10-09 22:26:03 +08:00
huangjingquan 72f2793b0a 修改了关注的显示 2013-10-09 21:53:07 +08:00
xianbo ad597695f5 fix register user.current bug
and course is show or hidden
2013-10-09 20:56:15 +08:00
huangjingquan bf081b95bd 学生自己的主页课程里面添加加入课程链接
竞赛里面 修复列表排序bug
新建竞赛的时候 修复了几个bug
2013-10-09 17:27:42 +08:00
baiyu 0226785f51 作业“关注”居左 2013-10-09 17:00:09 +08:00
baiyu 011c38988a 需求列表显示 2013-10-09 16:50:20 +08:00
fanqiang c75391b3a0 修改了加入课程窗口里文本框的长度 2013-10-09 16:47:54 +08:00
huangjingquan 82ce0ac8da 修改了参加竞标成提交作业 2013-10-09 16:46:56 +08:00
baiyu 39c45dff30 1、修改了注册里的问题
2、作业名称改为靠左
3、修改了提交作业、参加竞赛等混乱
4、修改了top bar的字体大小
2013-10-09 16:41:02 +08:00
huangjingquan 2a959a9b65 添加了学号 2013-10-09 16:28:24 +08:00
huangjingquan 9e77d3e001 修改了作业课程里面一些Bug 2013-10-09 16:14:11 +08:00
fanqiang 7d2bdbc935 在课程列表中添加加入课程按钮
在课程主页中添加关注按钮,修改加入课程和关注的样式
修改作业列表中提交作业的数量显示问题
2013-10-09 16:04:23 +08:00
huangjingquan b14f0e2901 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-10-08 22:21:24 +08:00
huangjingquan e19fe844a2 新增 2013-10-08 22:20:48 +08:00
baiyu aefd9b545b 1、删除了“企业”里的“课程”
2、减小了顶和踩的图标
3、更改了课程图标
2013-10-08 22:15:50 +08:00
huangjingquan 2c45fb8760 竞赛 2013-10-08 22:12:17 +08:00
fanqiang 8e51ea7327 修改了企业注册与修改企业资料过程,以及一些企业主页中的显示细节 2013-10-08 16:31:28 +08:00
huangjingquan 08aa5be7df 解决我的作业不显示问题 2013-10-07 22:50:20 +08:00
baiyu e5d06702c4 修改了新建“需求”的提示
修改了课程图标
2013-10-07 22:31:28 +08:00
huangjingquan cab5fb8b52 新的 2013-10-07 22:23:42 +08:00
nieguanghui 606c998247 修改课程列表显示内容,修复作业列表显示bug 2013-10-07 18:55:19 +08:00
fanqiang bf6fe70ec9 修改了作业的fork界面显示提示内容 2013-10-07 11:02:23 +08:00
baiyu 56e5e55589 修改了fork里的格式及若干国际化
修改了给项目留言回复的权限
隐藏了作业列表的“发布作业”
2013-10-02 21:47:18 +08:00
baiyu 64f36f2c9d 修改了一些BUG 2013-09-30 17:27:58 +08:00
baiyu 19962f2695 修改了主页的显示样式,
修改了我的课程,使得可以直接创建课程
2013-09-30 16:20:56 +08:00
yanxd 3ec4e14bfd fix sources bugs from zhangyang tmp code 2013-09-30 15:31:46 +08:00
baiyu 2a9cb28c4e 1、修改了国际化
2、增加了课程“年度”“学期”
3、主讲教师显示bug
2013-09-30 11:02:04 +08:00
huangjingquan 43a0a875f4 修改课程创建问题 2013-09-30 10:38:30 +08:00
huangjingquan 5c6bf7f9c8 修改课程退出的权限 2013-09-30 10:30:43 +08:00
huangjingquan 9c0b68460a 修改课程与企业样式 2013-09-30 09:42:13 +08:00
huangjingquan b6ca2c3d74 修改了讨论区bug 2013-09-29 20:04:03 +08:00
fanqiang 838894a19c 修改了需求评分功能,以及作业的提交 2013-09-29 19:58:57 +08:00
huangjingquan b19ed67d79 新的课程
修改了一些bug
2013-09-29 19:46:59 +08:00
fanqiang 9fbccfbb6d 改了一些问题
创建课程问题
添加了需求的FORK功能
2013-09-28 23:08:24 +08:00
baiyu aed36229f8 修改了issues里“顶”和“踩”图标的位置 2013-09-28 16:03:23 +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 4f72b68442 bug 修复。 2013-09-27 15:02:22 +08:00
william 2079c87362 增加tag删除。 2013-09-27 14:58:51 +08:00
baiyu 6e4e5ec577 修改了“顶”和“踩”的图标 2013-09-26 21:01:17 +08:00
fanqiang 4641f8cd63 修改引用作业中的显示样式 2013-09-26 10:10:53 +08:00
fanqiang 781fa32dbb 添加了需求的fork功能 2013-09-26 09:06:29 +08:00
baiyu 436569c88d 1、修改了location和identity不能显示的问题
2、修改了学号框样式
2013-09-25 17:20:40 +08:00
xianbo 75c9921231 modify work place in null but can create course 2013-09-24 16:18:50 +08:00
xianbo 633104b493 modify some bug about course and add db migrate 2013-09-24 12:15:24 +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
william 09fb972c96 分支合并 2013-09-24 09:05:07 +08:00
william cdad47f0cc 切换分支 添加应标项目评价显示 2013-09-23 21:54:07 +08:00
xianbo 8ff8d0f4d4 modify some little bug && merge handle 2013-09-23 21:47:07 +08:00
william 006f381a05 新增需求结束方式 2013-09-23 20:19:42 +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 c7c5ae54e5 课程里面新建会跳到项目里面! 2013-09-23 15:44:32 +08:00
huangjingquan 5dbef9e2c5 修改了日历和版本库bug 2013-09-23 15:12:06 +08:00
huangjingquan 278cb57ab9 修改了项目里面一些bug 2013-09-23 13:35:29 +08:00
baiyu 6ce27271e3 修改了身份
增加了职称、学号
2013-09-23 09:41:36 +08:00
huangjingquan 2d6fdc1d5a 资料权限问题 2013-09-23 09:32:04 +08:00
huangjingquan 3536883248 课程合并 2013-09-23 08:44:48 +08:00
baiyu 1c4f7f99e8 一些修订 2013-09-22 16:11:39 +08:00
baiyu c2302dc0c7 增加了附件删除功能
修改用户主页中课程与项目之间的关系
用户课程页面中的作业进行了按课程分组
2013-09-18 22:56:01 +08:00
baiyu a7b500f5e7 修正了“注册”和“我的账号”的显示格式 2013-09-16 21:56:12 +08:00
nieguanghui 45178e178f fix the projects's present bug 2013-09-16 21:47:46 +08:00
huangjingquan 960b59c807 修改了部分小bug 2013-09-16 10:56:37 +08:00
fanqiang 17dc3bc3a9 修改新建需求界面 2013-09-16 09:36:38 +08:00
fanqiang 9d2ea5639f 添加自动生成课程标识功能 2013-09-16 08:58:53 +08:00
huangjingquan 466922d13b 修改了上次会议提出的几点 2013-09-16 08:49:39 +08:00
fanqiang 671b81035c 修改课程部分的权限设置,并且修改了作业的侧边栏显示 2013-09-15 16:49:19 +08:00
fanqiang 50894d8950 将新闻添加进活动 2013-09-15 09:33:51 +08:00
huangjingquan 11370329dd 修改了部分功能 2013-09-14 17:25:57 +08:00
baiyu 2768c935be 1、增加了“我的状态” 2013-09-14 17:22:44 +08:00
huangjingquan e4cbc7533e tabs显示 2013-09-14 09:51:26 +08:00
fanqiang 131c5ba31b 修改留言功能 2013-09-14 08:45:18 +08:00
baiyu 313e66537e 增加了“地区” 2013-09-13 22:47:14 +08:00
huangjingquan 3a6f055159 solve some little problem 2013-09-13 22:25:40 +08:00
fanqiang 805ad6600b 添加了提交作业 2013-09-13 21:52:24 +08:00
huangjingquan 9221d1b376 dfh 2013-09-13 21:29:58 +08:00
huangjingquan 767231c202 fg 2013-09-13 16:36:36 +08:00
huangjingquan ffa412d290 x 2013-09-13 10:11:36 +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 7aa5eef2e4 fds 2013-09-12 17:25:40 +08:00
fanqiang 602e3dc3fa 修改个人主页 2013-09-12 17:19:51 +08:00
huangjingquan 261c3fc337 new version 2013-09-12 10:41:15 +08:00
baiyu 7e40999e06 1、增加了“注册”里的“身份”
2、增加了“我的账号”里的“工作单位”
2013-09-12 09:06:21 +08:00
baiyu a2cc191a4e 1、增加“我的账号”里的了工作单位
2、增加了“注册”里的“身份”
2013-09-12 08:38:47 +08:00
kaizheng 4dfffabb67 用户列表,需求列表,项目列表,用户粉丝列表,欢迎页面等英文页面解决单复数问题 2013-09-11 20:54:01 +08:00
nieguanghui d14b88f07f 修复管理员界面搜索bug 2013-09-10 21:09:42 +08:00
nieguanghui 68145ef5f7 优化排序显示,修改搜索页面显示 2013-09-10 21:02:29 +08:00
baiyu 9c6ab39527 修改了issue的history不换行问题 2013-09-09 10:24:32 +08:00
xianbo 7dbcc1520c course add data 2013-09-06 16:40:07 +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 578c757e29 统一了时间格式 2013-09-04 22:34:17 +08:00
baiyu 939da70402 修改了git使用方法 2013-09-04 22:22:56 +08:00
huangjingquan 55499db0ab 修改了英文版新闻评论被挤换行问题
英文版项目setting显示超出
2013-09-04 22:19:59 +08:00
nieguanghui d34df19a7a fix watch little bug 2013-09-04 17:36:08 +08:00
yanxd 5c1926f186 fix issue189 2013-09-03 22:26:33 +08:00
huangjingquan ca09583fa5 修改了英文关注和粉丝重复显示错误 2013-09-03 09:16:40 +08:00
baiyu e4d726bbfa Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-09-02 22:02:25 +08:00
huangjingquan f2ead4dae2 项目界面sidebar 2013-09-02 22:02:47 +08:00
baiyu f66e57e5b5 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-09-02 22:00:49 +08:00
xianbo e0336e6d9e modify the usage of git 2013-09-02 21:45:27 +08:00
Administrator 07b0409c57 delete UTC 2013-09-02 21:40:48 +08:00
Administrator f0791fe132 modify created project info as a fist activity 2013-09-02 21:32:15 +08:00
baiyu a7983fec8f Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-09-02 21:06:26 +08:00
baiyu 5dd8ca1f37 1、修改了git的用法
2、修改了国际化
2013-09-02 21:06:08 +08:00
huangjingquan a318266c60 修改用户列表tabs显示bug 2013-09-02 20:37:41 +08:00
xianbo f882a2d9b4 modify 国际化 2013-09-02 15:11:40 +08:00
huangjingquan 77a47797d2 user列表 2013-09-02 15:01:20 +08:00
huangjingquan 0aeb56f8f7 修改了按钮/用户反馈框显示错误 2013-09-02 13:29:46 +08:00
kaizheng f077fd397b 字体修复 2013-09-02 13:07:23 +08:00
huangjingquan c4df893eab 修改了tabs页面,字体大小 2013-09-02 12:49:17 +08:00
baiyu 844f1d2dcf 修改了不合理的地方 2013-08-31 21:45:20 +08:00
kaizheng 3d729df268 页面字体统一,登陆框异常排除,部分国际化 2013-08-31 17:04:11 +08:00
huangjingquan faef617a45 tabs显示
图像链接
2013-08-30 22:09:23 +08:00
huangjingquan 47185bdcc2 修改用户 -用户反馈显示异常 2013-08-30 16:07:51 +08:00
huangjingquan fe0845d475 天剑图片链接,tabs样式 2013-08-30 15:19:52 +08:00
zhangyang 4d82cad51d move 2013.8.29 2013-08-30 09:34:21 +08:00