 huang
|
b70104cee8
|
完整mail.text
|
11 years ago |
|
huang
|
70357683f7
|
用户申请加入项目邮件界面
|
11 years ago |
|
huang
|
fb034090d7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/projects_controller.rb
app/views/users/user_messages.html.erb
解决冲突
|
11 years ago |
|
huang
|
14acdef0cb
|
消息列表中增加权限判断
|
11 years ago |
guange
|
8ab08ea30f
|
Merge remote-tracking branch 'origin/szzh' into guange_homework
|
11 years ago |
|
guange
|
b6240127a9
|
对编程框进行代码着色
|
11 years ago |
 sw
|
6dab5ef34c
|
Merge branch 'develop' into szzh
|
11 years ago |
|
sw
|
df41414cf7
|
1、个人动态、作业列表、课程内作业列表编程语言显示不正确
|
11 years ago |
|
huang
|
b207c231f7
|
1、消息“同意加入”添加权限控制，项目成员不显示
2、区别项目成员和非项目成员的不同样式
3、访问项目和成员列表--则设置项目邀请消息为已读
|
11 years ago |
|
sw
|
b623894976
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
 ouyangxuhua
|
0300cbe319
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
ouyangxuhua
|
f4d11f8844
|
修改系统消息页面中，图片大小显示问题
|
11 years ago |
|
sw
|
ccd19021ae
|
课程动态回复之后，编辑器变宽
|
11 years ago |
|
huang
|
42745092c5
|
设置权限，其他人不能访问我的消息列表
|
11 years ago |
|
sw
|
64132de07f
|
test
|
11 years ago |
|
sw
|
d68ade19e1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
bbc14dbe5c
|
课程论坛回复框上信息错误
|
11 years ago |
|
sw
|
fdaa573249
|
动态页面自动增高后编辑框超出阴影区域
|
11 years ago |
|
ouyangxuhua
|
bc964ac931
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
ouyangxuhua
|
964738f203
|
系统消息的tips中，没有内容就不显示“内容”
|
11 years ago |
|
sw
|
a54a51c984
|
Merge branch 'guange_homework' into szzh
Conflicts:
app/models/homework_detail_programing.rb
db/schema.rb
|
11 years ago |
|
sw
|
2d0bf60bf2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
 cxt
|
b9bac42c1a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
cxt
|
098be99b84
|
动态回复框的样式调整
|
11 years ago |
|
huang
|
c8f2430004
|
系统消息每页显示10个
|
11 years ago |
|
sw
|
0a5d1c255a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
f1b1ec12a6
|
问卷的发布、关闭按钮增加tip
|
11 years ago |
|
huang
|
c9bedb2362
|
Merge branch 'szzh' into dev_hjq
|
11 years ago |
|
ouyangxuhua
|
0fcbbebd36
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
ouyangxuhua
|
e033a03c7a
|
tips
|
11 years ago |
|
huang
|
70f53a8376
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
961b2bd564
|
开启/关闭匿评邮件通知
|
11 years ago |
|
sw
|
5313bf0e3d
|
具体课程作业列表中也应该看到编程作业的匿评状态
|
11 years ago |
|
sw
|
7ba27026ae
|
教师在课程内编辑、删除作业之后仍然跳转回当前课程作业列表
|
11 years ago |
|
guange
|
c99222820e
|
加入了python语言支持
|
11 years ago |
|
sw
|
3e57aa1392
|
1、教师可以在动态界面进行答题
2、学生在动态界面看到作业动态显示为提交作品、修改作品
3、动态界面可以看到作业当前所处匿评状态
|
11 years ago |
|
ouyangxuhua
|
71794ccffc
|
tips显示主题和内容
|
11 years ago |
|
ouyangxuhua
|
1e97f9224f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
ouyangxuhua
|
400f394d05
|
tips标题
|
11 years ago |
|
huang
|
32f90ea591
|
"同意加入"只有自己才能看到
|
11 years ago |
|
huang
|
810c0d8fe5
|
作业开启/关闭匿评邮件通知
|
11 years ago |
|
huang
|
fb76bc8f9a
|
完成项目邀请消息通知及对应页面
解决防注入问题（通过随机6为密码）
|
11 years ago |
|
sw
|
05f7bf9634
|
test1
|
11 years ago |
|
sw
|
715dc28187
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
huang
|
79881f3dca
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
ouyangxuhua
|
3a4400cfee
|
tips样式
|
11 years ago |
|
huang
|
ff2e3e168d
|
开启/关闭匿评消息通知
|
11 years ago |
|
huang
|
850a7c937f
|
Merge branch 'szzh' into dev_hjq
|
11 years ago |
|
huang
|
ba2474e480
|
关闭匿评消息
|
11 years ago |
|
sw
|
4061aa8a14
|
提交作品关联项目提示信息
|
11 years ago |
