 huang
|
5b671c5109
|
issue 引用模式修改
issue相关代码优化
|
2015-09-23 14:27:47 +08:00 |
|
huang
|
8d64114c58
|
留言引用样式调整
|
2015-09-22 17:31:33 +08:00 |
|
huang
|
48b93f2113
|
项目缺陷消息点对点发送
回复逻辑优化（未完成）
|
2015-09-21 17:51:00 +08:00 |
|
huang
|
b70104cee8
|
完整mail.text
|
2015-09-21 14:54:03 +08:00 |
|
huang
|
70357683f7
|
用户申请加入项目邮件界面
|
2015-09-21 14:51:06 +08:00 |
|
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
解决冲突
|
2015-09-21 14:36:23 +08:00 |
|
huang
|
14acdef0cb
|
消息列表中增加权限判断
|
2015-09-21 14:28:22 +08:00 |
 guange
|
8ab08ea30f
|
Merge remote-tracking branch 'origin/szzh' into guange_homework
|
2015-09-19 18:18:02 +08:00 |
|
guange
|
b6240127a9
|
对编程框进行代码着色
|
2015-09-19 18:17:12 +08:00 |
 sw
|
6dab5ef34c
|
Merge branch 'develop' into szzh
|
2015-09-19 16:36:57 +08:00 |
|
sw
|
df41414cf7
|
1、个人动态、作业列表、课程内作业列表编程语言显示不正确
|
2015-09-19 16:29:29 +08:00 |
|
huang
|
b207c231f7
|
1、消息“同意加入”添加权限控制，项目成员不显示
2、区别项目成员和非项目成员的不同样式
3、访问项目和成员列表--则设置项目邀请消息为已读
|
2015-09-19 16:18:54 +08:00 |
|
sw
|
b623894976
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-19 13:46:08 +08:00 |
 ouyangxuhua
|
0300cbe319
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-19 13:46:54 +08:00 |
|
ouyangxuhua
|
f4d11f8844
|
修改系统消息页面中，图片大小显示问题
|
2015-09-19 13:46:35 +08:00 |
|
huang
|
42745092c5
|
设置权限，其他人不能访问我的消息列表
|
2015-09-19 12:58:45 +08:00 |
|
sw
|
64132de07f
|
test
|
2015-09-19 12:39:44 +08:00 |
|
sw
|
d68ade19e1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-19 11:52:19 +08:00 |
|
sw
|
bbc14dbe5c
|
课程论坛回复框上信息错误
|
2015-09-19 11:52:02 +08:00 |
|
sw
|
fdaa573249
|
动态页面自动增高后编辑框超出阴影区域
|
2015-09-19 11:37:31 +08:00 |
|
ouyangxuhua
|
bc964ac931
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-19 11:30:12 +08:00 |
|
ouyangxuhua
|
964738f203
|
系统消息的tips中，没有内容就不显示“内容”
|
2015-09-19 11:29:51 +08:00 |
|
sw
|
a54a51c984
|
Merge branch 'guange_homework' into szzh
Conflicts:
app/models/homework_detail_programing.rb
db/schema.rb
|
2015-09-19 11:21:45 +08:00 |
|
sw
|
2d0bf60bf2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-19 11:20:54 +08:00 |
 cxt
|
b9bac42c1a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-19 11:18:55 +08:00 |
|
cxt
|
098be99b84
|
动态回复框的样式调整
|
2015-09-19 11:18:41 +08:00 |
|
huang
|
c8f2430004
|
系统消息每页显示10个
|
2015-09-19 11:16:59 +08:00 |
|
sw
|
0a5d1c255a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-19 11:12:17 +08:00 |
|
sw
|
f1b1ec12a6
|
问卷的发布、关闭按钮增加tip
|
2015-09-19 11:06:39 +08:00 |
|
huang
|
c9bedb2362
|
Merge branch 'szzh' into dev_hjq
|
2015-09-19 11:01:48 +08:00 |
|
ouyangxuhua
|
0fcbbebd36
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-19 10:58:00 +08:00 |
|
ouyangxuhua
|
e033a03c7a
|
tips
|
2015-09-19 10:57:42 +08:00 |
|
huang
|
70f53a8376
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-19 10:55:36 +08:00 |
|
huang
|
961b2bd564
|
开启/关闭匿评邮件通知
|
2015-09-19 10:54:50 +08:00 |
|
sw
|
7ba27026ae
|
教师在课程内编辑、删除作业之后仍然跳转回当前课程作业列表
|
2015-09-19 10:45:42 +08:00 |
|
guange
|
c99222820e
|
加入了python语言支持
|
2015-09-19 10:39:10 +08:00 |
|
sw
|
3e57aa1392
|
1、教师可以在动态界面进行答题
2、学生在动态界面看到作业动态显示为提交作品、修改作品
3、动态界面可以看到作业当前所处匿评状态
|
2015-09-19 10:33:38 +08:00 |
|
ouyangxuhua
|
71794ccffc
|
tips显示主题和内容
|
2015-09-19 10:25:58 +08:00 |
|
ouyangxuhua
|
1e97f9224f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-19 09:22:51 +08:00 |
|
ouyangxuhua
|
400f394d05
|
tips标题
|
2015-09-19 09:22:36 +08:00 |
|
huang
|
32f90ea591
|
"同意加入"只有自己才能看到
|
2015-09-19 09:19:35 +08:00 |
|
huang
|
810c0d8fe5
|
作业开启/关闭匿评邮件通知
|
2015-09-19 00:03:45 +08:00 |
|
huang
|
fb76bc8f9a
|
完成项目邀请消息通知及对应页面
解决防注入问题（通过随机6为密码）
|
2015-09-18 23:18:15 +08:00 |
|
sw
|
715dc28187
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-18 17:51:11 +08:00 |
|
ouyangxuhua
|
3a4400cfee
|
tips样式
|
2015-09-18 17:49:43 +08:00 |
|
huang
|
850a7c937f
|
Merge branch 'szzh' into dev_hjq
|
2015-09-18 17:39:37 +08:00 |
|
sw
|
bb197897b7
|
作品列表enter键搜索，以及提示信息修改
|
2015-09-18 17:27:10 +08:00 |
|
sw
|
ec4c7f531d
|
匿评作业成绩计算错误
|
2015-09-18 17:16:31 +08:00 |
|
huang
|
c8f7655d1e
|
系统消息样式
|
2015-09-18 17:01:30 +08:00 |
|
cxt
|
cacb3e043a
|
动态回复框的焦点前焦点后样式调整
|
2015-09-18 16:34:37 +08:00 |