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 |