 huangjingquan
|
29f058efba
|
修改了新建课程的时候报错
|
2013-11-04 15:30:02 +08:00 |
|
huangjingquan
|
27299586c2
|
修改了top——mune
|
2013-11-04 15:20:22 +08:00 |
|
huangjingquan
|
7e7534041e
|
课程列表新的权限设置
|
2013-11-04 09:57:36 +08:00 |
yanxd
|
ce7b2ceba0
|
fix teacher/student search Identifier
|
2013-11-04 09:45:56 +08:00 |
|
huangjingquan
|
c93ca4d2ed
|
添加了作业截止时间提醒功能！
|
2013-11-02 15:43:38 +08:00 |
|
yanxd
|
0b61b4ef5b
|
move flash message to page top in course/setting
|
2013-11-02 14:22:40 +08:00 |
|
yanxd
|
19b983e103
|
move flash message to top on base_project
|
2013-11-02 14:17:15 +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
|
fb54fcbe86
|
修改了新闻页面两个图像重复bug
|
2013-11-02 10:45:58 +08:00 |
|
huangjingquan
|
09eb16ad9a
|
修改了项目和课程里面成员配置显示错误
|
2013-11-02 10:34:53 +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
|
775ebc3607
|
新闻界面添加删除功能
|
2013-11-01 10:01:16 +08:00 |
|
huangjingquan
|
5febe8a58d
|
个人主页课程列表加入了“退出课程”和加入课程按钮
|
2013-11-01 09:06:06 +08:00 |
|
baiyu
|
b2080a4470
|
加入了开课时间，结课时间选项
增加了课时文本框
相应的增加了显示
|
2013-11-01 08:45:24 +08:00 |
|
yanxd
|
0a21b87714
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-01 08:19:08 +08:00 |
 nieguanghui
|
75c0480071
|
增加个人活动列表，作业过滤功能，删除课程作业搜索框，修复课程页面以学生角色搜索也会出现新建课程的bug
|
2013-10-31 21:44:10 +08:00 |
|
yanxd
|
54d9566a7b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-10-31 20:14:27 +08:00 |
|
yanxd
|
b55c5d20a3
|
added activity info from event, warning.
|
2013-10-31 20:13:49 +08:00 |
|
xianbo
|
c7d96dd183
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-10-31 17:29:04 +08:00 |
|
xianbo
|
743ef9856a
|
only teacher can know his tag and modify it
|
2013-10-31 17:28:10 +08:00 |
|
yanxd
|
369e5eccc0
|
member_list ,group by roles in course#show
|
2013-10-31 16:52:06 +08:00 |
|
xianbo
|
08f1453dbd
|
modify some show in create course and project
|
2013-10-31 16:44:05 +08:00 |
|
xianbo
|
9f8c764053
|
modify new cresate is_piublic? and leave some module about select
|
2013-10-31 16:21:34 +08:00 |
|
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
|
5fb0bc945c
|
修改了删除“我的账号”后的小问题
|
2013-10-30 21:22:44 +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 |
|
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 |
|
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 |