 nwb
|
d87b52bedd
|
课程成员迁移
|
2014-06-04 09:19:01 +08:00 |
|
nwb
|
cd10dd5433
|
课程权限判断变更，从项目权限分离
|
2014-06-03 16:21:00 +08:00 |
|
nwb
|
7d3d406c00
|
新增部分课程所需的解析函数
|
2014-06-03 11:16:06 +08:00 |
|
nwb
|
9f948c971f
|
添加课程排序方法
|
2014-06-03 09:56:54 +08:00 |
|
nwb
|
e490f7979d
|
添加课程index界面
|
2014-06-03 09:39:33 +08:00 |
|
nwb
|
e15bad7462
|
course新增列并更改相关逻辑
|
2014-05-30 10:48:06 +08:00 |
|
nwb
|
ea3b80fdc6
|
添加CourseStatus表和model
|
2014-05-29 16:47:32 +08:00 |
|
nwb
|
f936c30ec9
|
添加与course.index相关的control、view、help等实现
|
2014-05-29 16:35:34 +08:00 |
|
nwb
|
4e815a38b6
|
更改路由，课程独立出来，不再包含在项目中
|
2014-05-29 15:21:22 +08:00 |
 sw
|
cbb2312047
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-28 20:05:00 +08:00 |
|
sw
|
b9550cedb9
|
课程作业显示界面修改
|
2014-05-28 19:54:53 +08:00 |
 z9hang
|
2e36949604
|
添加课程列表查看权限（需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看）
|
2014-05-28 18:04:16 +08:00 |
|
sw
|
91497d3f95
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-28 17:07:50 +08:00 |
|
sw
|
3546355f70
|
增加修改昵称功能以及昵称是否重复的判断
|
2014-05-28 17:07:23 +08:00 |
|
z9hang
|
2d77975221
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/courses_helper.rb
app/views/bids/_homework_list.html.erb
config/locales/en.yml
|
2014-05-28 15:40:57 +08:00 |
|
z9hang
|
1c92007ac6
|
课程个人主页动态改为 昵称（真名） 形式显示（对该课程的老师助教）
作业里老师助教看到真名
|
2014-05-28 15:31:22 +08:00 |
|
sw
|
218fb3f831
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
config/locales/zh.yml
|
2014-05-28 15:24:37 +08:00 |
|
sw
|
e0273d320c
|
1.登录增加js提示可以用昵称和邮箱登录
2.修改资料界面增加昵称的修改以及修改昵称的验证
3.修改昵称的描述
|
2014-05-28 15:05:11 +08:00 |
|
nwb
|
b52690adc2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-28 14:43:32 +08:00 |
|
nwb
|
61135a352a
|
上传文件表单支持添加文件标签
|
2014-05-28 14:43:20 +08:00 |
|
z9hang
|
eb0e149ac7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-28 14:17:53 +08:00 |
|
z9hang
|
daecf1a53b
|
老师收到课程留言区的直接留言及对老师的回复的邮件提醒
|
2014-05-28 14:17:43 +08:00 |
 yanxd
|
5d8edb218f
|
管理员查看user_projects 课程项目混淆的问题
|
2014-05-28 11:47:50 +08:00 |
|
z9hang
|
31804b3d45
|
发邮件
|
2014-05-28 11:10:31 +08:00 |
|
yanxd
|
306ae9f685
|
用户tag点击之后的名字显示修改，用户邮箱隐藏
|
2014-05-28 10:25:42 +08:00 |
|
sw
|
8227c5222a
|
修复老师未进行综评的用户进入互评界面报错的BUG
|
2014-05-28 08:50:38 +08:00 |
|
z9hang
|
cd333c8f35
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-27 20:03:28 +08:00 |
|
sw
|
27a30d44be
|
1.修改判断当前用户是不是为课程老师的方法
2.增加作业综评功能
3.其他课程的学生是不能互评的，只有本门课程的学生可以互评
4.修改添加评论方法
5.修复当作业无人评论时，作业最终得分只显示一个分字
|
2014-05-27 20:01:21 +08:00 |
|
z9hang
|
bf12692de4
|
登录名==》账号/邮箱
老师在课程动态中看到学生真名
|
2014-05-27 17:04:29 +08:00 |
|
nwb
|
68b9a7efc5
|
修正批准成员申请未选择角色时的BUG
|
2014-05-27 14:21:59 +08:00 |
|
z9hang
|
ddf5590c54
|
修复个人主页查看关注的项目时报user_id指代不明的sql错误
|
2014-05-26 17:04:55 +08:00 |
|
z9hang
|
5d4eec010e
|
隐藏点击描述用户的标签后跳到的标签页面显示的用户邮箱
|
2014-05-26 16:49:41 +08:00 |
|
z9hang
|
ab85ee5169
|
admin个人主页项目功能修正
admin管理用户的搜索功能从/users/search中分离到/admin/search
admin管理用户界面添加管理界面布局
|
2014-05-26 16:25:53 +08:00 |
|
yanxd
|
654cb404e2
|
bootstrap test
|
2014-05-26 11:27:10 +08:00 |
|
yanxd
|
12b1553a33
|
Merge branch 'develop' into szzh
|
2014-05-26 09:05:36 +08:00 |
|
yanxd
|
2273a6fd0b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-05-26 08:56:58 +08:00 |
|
yanxd
|
d77d7e14c7
|
home page memo css no wrap
|
2014-05-26 08:56:16 +08:00 |
|
yanxd
|
7a4e5afba0
|
test
|
2014-05-24 12:12:38 +08:00 |
|
z9hang
|
0e6d9a804a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-24 09:03:38 +08:00 |
|
z9hang
|
ee3a5f5719
|
代码修改
|
2014-05-23 17:40:59 +08:00 |
t430
|
fd0a504d84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2014-05-23 17:12:10 +08:00 |
|
yanxd
|
5364687160
|
bootstrap & tag bug
|
2014-05-23 17:07:58 +08:00 |
|
xianbo
|
be1a0e0fea
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-23 14:32:26 +08:00 |
|
xianbo
|
734caef3dc
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-23 14:21:34 +08:00 |
|
xianbo
|
a3a95556a3
|
fix 王林春提交了冲突文件
|
2014-05-23 14:16:32 +08:00 |
|
z9hang
|
ad5ac329f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-23 11:50:48 +08:00 |
|
z9hang
|
6583ccb001
|
admin账户个人主页显示修改
admin账户用户管理功能分离到/admin/users，软件创客功能与普通账户一致
|
2014-05-23 11:50:36 +08:00 |
|
t430
|
edfd7372bb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2014-05-23 11:42:41 +08:00 |
|
yanxd
|
4eebd48f92
|
realname
|
2014-05-23 11:38:30 +08:00 |
|
yanxd
|
3ae7729539
|
Merge branch 'szzh' into develop
|
2014-05-23 11:00:46 +08:00 |