 nieguanghui
|
5d83a03e5f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-04 22:01:06 +08:00 |
yanxd
|
397eb11dca
|
refactor memberlist
|
2013-11-04 22:00:06 +08:00 |
|
nieguanghui
|
c6824c539b
|
修复作业搜索条出现在竞赛，需求页面的bug
|
2013-11-04 21:58:40 +08:00 |
 huangjingquan
|
ea8a87c3a6
|
需求里面增加了搜索功能
|
2013-11-04 21:55:47 +08:00 |
 baiyu
|
be20b2c7fe
|
增加了需求导航，超链接
|
2013-11-04 21:52:01 +08:00 |
|
baiyu
|
f113cb7667
|
增加了需求导航，样式，超链接
|
2013-11-04 21:39:45 +08:00 |
|
huangjingquan
|
bb994f8b7d
|
修改了搜索结果显示
|
2013-11-04 21:38:14 +08:00 |
|
baiyu
|
be14669f6b
|
修改了个人主页导航超链接不能显示全名
|
2013-11-04 20:54:20 +08:00 |
|
huangjingquan
|
c8427fe61e
|
修改了作业、项目、课程页面
|
2013-11-04 20:51:47 +08:00 |
|
baiyu
|
20c2feef30
|
增加了“项目门户”的当前位置导航、样式、配套的超链接
|
2013-11-04 20:18:44 +08:00 |
|
huangjingquan
|
8ee5381e44
|
修改了用户个人主页样式
|
2013-11-04 16:07:31 +08:00 |
|
huangjingquan
|
29f058efba
|
修改了新建课程的时候报错
|
2013-11-04 15:30:02 +08:00 |
|
huangjingquan
|
27299586c2
|
修改了top——mune
|
2013-11-04 15:20:22 +08:00 |
|
yanxd
|
2a6171ca52
|
refactor course helper
|
2013-11-04 15:00:08 +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 |
|
nieguanghui
|
cab092cd04
|
修改课程默认排序方式
|
2013-11-01 11:17:24 +08:00 |
|
nieguanghui
|
583c022048
|
修复作业列表搜索bug
|
2013-11-01 10:48:02 +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
|
db25900336
|
修复新建项目的时候相关信息写入丢失bug
|
2013-10-31 22:07:31 +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
|
67d228142a
|
add the root in bid modify about homework
|
2013-10-31 16:33:15 +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
|
9b9745ea0a
|
对于应标需求，提交作业，提交竞赛作品成功后闪出的flash做了区别
|
2013-10-30 21:46:40 +08:00 |