Commit Graph

9476 Commits

Author SHA1 Message Date
guange 0b4c8b05f1 JAVA语言支持 2015-09-24 15:09:15 +08:00
sw d727097ed2 1、已开启匿评代码没有匿评设置功能
2、匿评结束不显示
2015-09-23 17:33:06 +08:00
sw 7b37f3a9f4 开启匿评、关闭匿评任务编写 2015-09-23 17:25:38 +08:00
sw fa13ccfaa8 匿评参数设置功能完成 2015-09-23 15:44:48 +08:00
sw 9d474d6528 设置匿评属性静态页面 2015-09-23 13:54:36 +08:00
sw 193eb0cb6e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-23 10:03:45 +08:00
cxt afb1a8f53f 回复框发送按钮的样式调整 2015-09-23 09:59:23 +08:00
sw b5af66ffc2 取消匿评时间的js判断 2015-09-23 09:58:31 +08:00
sw 3cb125ccbf 发布作业界面取消开启匿评日期和关闭匿评日期的设置
删除无效代码文件
2015-09-23 09:51:30 +08:00
cxt 76afbdec3f 隐藏kindeditor的“插入代码”,调整项目编号/符号的样式 2015-09-23 09:23:31 +08:00
cxt 7954b5ace8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-23 08:57:03 +08:00
cxt 576adfac34 回复框中出现html代码的修复 2015-09-23 08:56:48 +08:00
sw 20e9cba93a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-22 16:52:59 +08:00
sw 50817c3d64 编译错误时 计算系统评分不正确 2015-09-22 16:52:21 +08:00
cxt d1ecc7bc54 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-22 16:27:44 +08:00
cxt 3e58264a28 个人首页动态的列表li的项目符号不显示的问题修复 2015-09-22 16:27:27 +08:00
sw f2325dee88 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-22 16:21:54 +08:00
sw 1e95d5247d 调整标题栏位置 2015-09-22 16:21:36 +08:00
sw 9d2b58738e 分班过滤功能 2015-09-22 16:16:55 +08:00
Tim 93804bcfa6 关于我们图片对齐 2015-09-22 16:11:22 +08:00
cxt a37f39558d 项目和课程的列表符号样式修改 2015-09-22 15:54:50 +08:00
cxt 660e604045 kindeditor编辑框的列表符号样式修改 2015-09-22 15:54:19 +08:00
sw 90536efa1e 课程内姓名学号邮箱过滤,各种排序 改为js刷新页面 2015-09-22 15:52:08 +08:00
sw 2d48161928 新版作品列表界面 2015-09-22 15:03:03 +08:00
cxt 83e2a4b5bd 新建问卷页面添加问卷描述提示文字 2015-09-22 09:47:39 +08:00
sw 7a62b7f13d 增加匿评开启时间和匿评关闭时间,并对其业务逻辑进行js的控制。以及这两个值得修改 2015-09-21 17:11:45 +08:00
cxt 8883093b96 "关于我们"的图片居中 2015-09-21 17:05:51 +08:00
cxt facd12640a 个人动态的回复为0时不显示“回复(0)” 2015-09-21 16:54:23 +08:00
cxt 7c8f0decc6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-21 16:21:13 +08:00
cxt 9be7e633ae 动态回复框的样式调整 2015-09-21 16:20:29 +08:00
sw 9f0eb937fe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-21 15:24:08 +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
sw 5b8cd26880 Merge branch 'develop' into szzh 2015-09-21 13:51:26 +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 ecd22182cc Merge branch 'szzh' into develop 2015-09-19 16:37:46 +08:00
sw 6dab5ef34c Merge branch 'develop' into szzh 2015-09-19 16:36:57 +08:00
sw 9ce00030ad Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-19 16:36:42 +08:00
sw df41414cf7 1、个人动态、作业列表、课程内作业列表编程语言显示不正确 2015-09-19 16:29:29 +08:00
sw 2a8cf2885a 布置作业时选择语言显示不正确 2015-09-19 16:23:47 +08:00
huang b207c231f7 1、消息“同意加入”添加权限控制,项目成员不显示
2、区别项目成员和非项目成员的不同样式
3、访问项目和成员列表--则设置项目邀请消息为已读
2015-09-19 16:18:54 +08:00
sw 38c542dff5 Merge branch 'szzh' into develop 2015-09-19 15:26:01 +08:00
sw 6c511702d5 Merge branch 'guange_homework' into szzh 2015-09-19 15:23:57 +08:00
sw 385f2aa4ac 111 2015-09-19 15:23:01 +08:00
guange 186bf9070c 配置丢失 2015-09-19 15:21:51 +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
sw ccd19021ae 课程动态回复之后,编辑器变宽 2015-09-19 13:45:32 +08:00