xianbo
|
0706fdd6dc
|
let the homework show under class in homeworkpager
|
2013-10-31 15:58:14 +08:00 |
 huangjingquan
|
477e299e24
|
修改了用户主页课程列表显示
去掉了作业和关注需求，将关注需求统计显示
|
2013-10-31 15:18:42 +08:00 |
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
|
f55a06e76d
|
1、"活动“变成了动态，”只看自己“改成了”我的动态“
2、解释了项目是什么
|
2013-10-30 22:04:47 +08:00 |
|
baiyu
|
9b9745ea0a
|
对于应标需求，提交作业，提交竞赛作品成功后闪出的flash做了区别
|
2013-10-30 21:46:40 +08:00 |
|
baiyu
|
5fb0bc945c
|
修改了删除“我的账号”后的小问题
|
2013-10-30 21:22:44 +08:00 |
|
yanxd
|
b617f3d42f
|
fix my welcome#index bug
|
2013-10-30 21:15:00 +08:00 |
|
baiyu
|
9319a7f87b
|
去掉了top_bar上“我的账号”
|
2013-10-30 21:10:28 +08:00 |
|
yanxd
|
868025bb40
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-10-30 20:57:17 +08:00 |
|
yanxd
|
67216ca463
|
fix back_url bug
|
2013-10-30 20:56:24 +08:00 |
|
huangjingquan
|
b113719b46
|
课程里面添加了图片上传功能
|
2013-10-30 20:50:35 +08:00 |
|
yanxd
|
8a37f924f9
|
remove nyancss
|
2013-10-30 20:30:56 +08:00 |
|
yanxd
|
dd0c087209
|
rest tan backurl
|
2013-10-30 11:23:40 +08:00 |
 nieguanghui
|
224a194759
|
修复成员 bug，修复作业显示bug‘
|
2013-10-30 10:45:37 +08:00 |
|
xianbo
|
1f419c936d
|
del the back_url to let the different identity change has a correct url
|
2013-10-30 08:51:58 +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
|
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 |