225 Commits

Author	SHA1	Message	Date
yanxd	0b04b28024	Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop	2013-10-31 10:58:20 +08:00
yanxd	2286fbeff5	members split (teacher,student) in course	2013-10-31 10:57:46 +08:00
xianbo	5dfac1d8e3	add modify about homework and modify the show of toll bar	2013-10-30 22:17:51 +08:00
baiyu	9b9745ea0a	对于应标需求，提交作业，提交竞赛作品成功后闪出的flash做了区别	2013-10-30 21:46:40 +08:00
yanxd	67216ca463	fix back_url bug	2013-10-30 20:56:24 +08:00
nieguanghui	224a194759	修复成员 bug，修复作业显示bug‘	2013-10-30 10:45:37 +08:00
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	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
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
nieguanghui	5ce9bcdb2c	解决竞赛，需求，作业列表搜索bug	2013-10-21 21:16:41 +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
baiyu	ecdeaf123e	修改了部分国际化	2013-10-19 15:39:53 +08:00
baiyu	0206d3f2c3	需求里面添加了用户和项目与需求的联系	2013-10-19 09:35:14 +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
yanxd	69869a05c9	reverse projects list, add explain to role.	2013-10-16 10:58:21 +08:00
nieguanghui	17a4f14f2a	修复课程和项目搜索bug	2013-10-15 16:29:35 +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
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	c49209cbfb	将课程和作业分开 ... 作业单独一个tabs	2013-10-11 20:25:24 +08:00
baiyu	13a2cfe644	修改了fork页面，增加了教师超链接	2013-10-10 23:02:15 +08:00
fanqiang	962842d841	修改了提交作业数量显示问题，修改了创建需求的种类选择问题	2013-10-10 21:56:27 +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
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	3b6f0e3d34	modify delete project and user and define a course is a public	2013-10-09 22:26:03 +08:00
huangjingquan	bf081b95bd	学生自己的主页课程里面添加加入课程链接 ... 竞赛里面 修复列表排序bug 新建竞赛的时候 修复了几个bug	2013-10-09 17:27:42 +08:00
huangjingquan	9e77d3e001	修改了作业课程里面一些Bug	2013-10-09 16:14:11 +08:00
huangjingquan	2c45fb8760	竞赛	2013-10-08 22:12:17 +08:00
fanqiang	8e51ea7327	修改了企业注册与修改企业资料过程，以及一些企业主页中的显示细节	2013-10-08 16: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