xianbo
|
abea7add69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-14 20:15:24 +08:00 |
|
xianbo
|
6279041361
|
fix links
|
2013-11-14 20:15:08 +08:00 |
 baiyu
|
2f8ef03d32
|
1、增加了参与竞赛的用户列表
2、区分了个人主页里“粉丝”列表里的项目与课程的计数与显示
3、竞赛发布人的名字改为了全称
|
2013-11-14 17:01:06 +08:00 |
|
baiyu
|
005e0802d4
|
增加了竞赛的“加入”
|
2013-11-14 15:55:56 +08:00 |
 huangjingquan
|
2d90215de2
|
修改了个人主页课程列表权限
|
2013-11-13 11:03:51 +08:00 |
|
xianbo
|
df628aff9d
|
modify curse nil error
|
2013-11-12 09:16:25 +08:00 |
|
xianbo
|
02ff8b8955
|
take off course fomre form the projrct ehich is watched
|
2013-11-12 09:04:39 +08:00 |
 nieguanghui
|
6352ae7aa6
|
fix bug
|
2013-11-09 09:26:02 +08:00 |
|
nieguanghui
|
57c28102e9
|
fix some thing
|
2013-11-09 09:04:23 +08:00 |
|
huangjingquan
|
59d0cc8e7a
|
修改了个人主页项目列表
|
2013-11-09 08:56:34 +08:00 |
|
huangjingquan
|
22ce616a78
|
修改了按钮样式
|
2013-11-08 22:02:52 +08:00 |
|
huangjingquan
|
718fa65fc4
|
整个界面样式协调
|
2013-11-08 20:54:45 +08:00 |
|
huangjingquan
|
f13665959a
|
作业列表样式修改
项目新闻样式修改
|
2013-11-08 17:26:47 +08:00 |
|
huangjingquan
|
534c252bcb
|
修改了课程列表样式，部分国际化
|
2013-11-08 15:59:08 +08:00 |
|
huangjingquan
|
6e9f3d53e5
|
新增一个user列表页面
|
2013-11-08 11:25:33 +08:00 |
|
nieguanghui
|
dd6563cf8c
|
优化用户搜索
|
2013-11-08 11:01:28 +08:00 |
|
baiyu
|
a52944811b
|
修正了用户列表里“参与了xx个项目”改为“参与了XX个项目”和“参与了XX个课程”
|
2013-11-08 09:02:14 +08:00 |
|
xianbo
|
5032eaabcb
|
fix the show out of the frame and the location of show
|
2013-11-07 19:14:57 +08:00 |
yanxd
|
7c4e62cc40
|
add time describe
|
2013-11-07 17:21:32 +08:00 |
|
xianbo
|
607eb2c2ff
|
modify shoew of project
|
2013-11-07 17:04:37 +08:00 |
|
nieguanghui
|
50b91e3942
|
修改按钮样式，增加附件过滤
|
2013-11-07 15:58:15 +08:00 |
|
huangjingquan
|
6499352d8e
|
修改了无项目时候 新建按钮重复提示
|
2013-11-06 17:00:14 +08:00 |
|
nieguanghui
|
8df3bcf76f
|
修改评分显示颜色，重构课程列表显示部分代码
|
2013-11-06 16:43:07 +08:00 |
|
baiyu
|
0f3eb9cf87
|
kec
|
2013-11-06 09:25:05 +08:00 |
|
huangjingquan
|
49c22fbec3
|
个人主页课程列表里面添加了学期
|
2013-11-05 20:04:45 +08:00 |
|
xianbo
|
88084990bf
|
fix
|
2013-11-05 15:59:12 +08:00 |
|
huangjingquan
|
c8427fe61e
|
修改了作业、项目、课程页面
|
2013-11-04 20:51:47 +08:00 |
|
huangjingquan
|
7e7534041e
|
课程列表新的权限设置
|
2013-11-04 09:57:36 +08:00 |
|
huangjingquan
|
84327892a9
|
加入/退出课程权限修改
|
2013-11-02 13:00:32 +08:00 |
|
xianbo
|
003b4704cc
|
fix link to
|
2013-11-02 12:42:30 +08:00 |
|
baiyu
|
606b2d0587
|
在我的主页的“课程”列表里加入了“主讲教师”
|
2013-11-02 11:06:22 +08:00 |
|
huangjingquan
|
ac2b90ecfd
|
退出课程加入权限
|
2013-11-01 16:08:41 +08:00 |
|
xianbo
|
c7b38e5bf2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/news/index.html.erb
|
2013-11-01 15:53:38 +08:00 |
|
xianbo
|
ca0f63a817
|
del the link of .head portrait
|
2013-11-01 15:48:23 +08:00 |
|
huangjingquan
|
5febe8a58d
|
个人主页课程列表加入了“退出课程”和加入课程按钮
|
2013-11-01 09:06:06 +08:00 |
|
nieguanghui
|
75c0480071
|
增加个人活动列表，作业过滤功能，删除课程作业搜索框，修复课程页面以学生角色搜索也会出现新建课程的bug
|
2013-10-31 21:44:10 +08:00 |
|
huangjingquan
|
477e299e24
|
修改了用户主页课程列表显示
去掉了作业和关注需求，将关注需求统计显示
|
2013-10-31 15:18:42 +08:00 |
|
baiyu
|
f55a06e76d
|
1、"活动“变成了动态，”只看自己“改成了”我的动态“
2、解释了项目是什么
|
2013-10-30 22:04:47 +08:00 |
|
xianbo
|
e9856b3524
|
modify the style of the projects witch show
|
2013-10-28 20:09:15 +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 |
|
yanxd
|
666806ae28
|
fixed little bug
|
2013-10-22 16:15:27 +08:00 |
|
nieguanghui
|
5ce9bcdb2c
|
解决竞赛，需求，作业列表搜索bug
|
2013-10-21 21:16:41 +08:00 |
|
nieguanghui
|
b04fe3d1bb
|
增加项目评分 个人评分 ，个人在项目中的评分机制
|
2013-10-21 09:42:09 +08:00 |
baiyu
|
ecdeaf123e
|
修改了部分国际化
|
2013-10-19 15:39:53 +08:00 |
|
xianbo
|
520c5843ce
|
modify homework show and the link of style
|
2013-10-16 17:02:38 +08:00 |
|
yanxd
|
69869a05c9
|
reverse projects list, add explain to role.
|
2013-10-16 10:58:21 +08:00 |
|
xianbo
|
8c675c2a96
|
add show about setting about course
|
2013-10-14 16:38:52 +08:00 |
 huangjingquan
|
bcb66f2b32
|
在个人主页项目里面添加新建按钮
|
2013-10-13 15:26:41 +08:00 |