Commit Graph

9125 Commits

Author SHA1 Message Date
sw a3d628dc17 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 16:29:55 +08:00
sw 760b70971a 取消导入编程作业时对homework_type的赋值 2015-09-11 16:27:34 +08:00
sw 90a52aa01b 导入编程作业后、测试集数量不显示的问题 2015-09-11 16:26:35 +08:00
sw 37f235c2ab 导入编程作业 2015-09-11 16:22:35 +08:00
sw 96405d7c0c 取消之后编程按钮无效 2015-09-11 15:38:58 +08:00
sw 4405a31c9c Merge branch 'guange_homework' into szzh 2015-09-11 15:07:59 +08:00
guange e9f9dd44b9 编程作业的修改功能搞定 2015-09-11 14:59:30 +08:00
lizanle dc32bba5fd Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-11 14:44:59 +08:00
lizanle 17b4b31449 隐藏个人中心的回复 textarea编辑框 2015-09-11 14:44:50 +08:00
sw 487f46bb32 上传图片后大小问题 2015-09-11 11:46:12 +08:00
guange 37e1b6d2a1 Merge remote-tracking branch 'origin/szzh' into guange_homework 2015-09-11 11:43:29 +08:00
sw 6004fe1b4d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 11:36:59 +08:00
sw cd36965cd1 历史编程作业数据补齐 2015-09-11 11:31:59 +08:00
lizanle 8848b3975e 防止生成的kindeditor太高 2015-09-11 10:52:13 +08:00
sw f4c19c0fb0 1、homework.js on改为live
2、导入作业之后,编程功能按钮消失
2015-09-11 10:50:16 +08:00
sw 527ff41d43 1、编程作业开启匿评之后提交作品的提示
2、匿评弹框不可关闭
2015-09-11 10:44:10 +08:00
sw dfed4885de 新建作业,取消之后编程设置按钮消失 2015-09-11 10:36:16 +08:00
sw 7db774eedb 新建作业时,匿评相关属性为作业必须属性 2015-09-11 10:19:45 +08:00
sw 30ebe9b2d5 1、编程作业可以开启匿评
2、取消扣分标准的显示
2015-09-11 09:59:34 +08:00
sw a94521f2e1 编辑普通作业功能完成 2015-09-11 09:36:44 +08:00
sw 948a6c9138 隐藏教师节相关信息 2015-09-11 09:20:43 +08:00
sw 6730c4da84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 09:17:08 +08:00
sw 66636efda9 修改普通作业 2015-09-11 09:15:54 +08:00
lizanle 2beb85561a 上传资源后,全选按钮和已选择资源数清空 2015-09-11 09:08:05 +08:00
lizanle 795ce09d5e Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-10 17:30:11 +08:00
lizanle e5e3eeca2c kindeditor icon顺序调整 2015-09-10 17:30:01 +08:00
sw f0bd113a5e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-10 17:11:38 +08:00
sw 93b179c958 修改普通作业 2015-09-10 17:11:16 +08:00
guange 424f674da9 Merge remote-tracking branch 'origin/szzh' into guange_homework 2015-09-10 17:09:04 +08:00
lizanle 80e38287dd 所有baselayout都引入prttefy.css .js
调整资源库宽度
2015-09-10 16:38:45 +08:00
lizanle cc6fe754d4 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-10 15:45:46 +08:00
lizanle 756aae0cf2 发布issue编辑器可以上传代码并高亮显示了 2015-09-10 15:45:08 +08:00
cxt e6d5d17859 轻抚展开更多->展开更多 2015-09-10 15:08:10 +08:00
cxt 5f0aac9265 点击打开编辑资料,显示保存的性别 2015-09-10 15:01:59 +08:00
sw fce5405c41 发布作业界面样式调整 2015-09-10 14:44:25 +08:00
guange a29ab60481 老师的测试结果能显示出来 2015-09-10 11:34:10 +08:00
sw 97a944ff27 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-10 10:28:55 +08:00
sw 97f9d4fa60 增加教师节祝福语 2015-09-10 10:26:16 +08:00
cxt 50aa22c5e5 个人动态的“点击展开更多”改为“轻抚展开更多”,鼠标移到方框上即自动加载更多动态 2015-09-10 10:01:43 +08:00
sw a841c20896 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-09 17:51:13 +08:00
cxt 28d4bae9e7 修改课程/项目的导航栏区域的文字样式 2015-09-09 17:53:34 +08:00
sw e30abd2a81 提交、修改作品界面宽度 2015-09-09 17:50:49 +08:00
cxt 5b14dbba45 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-09 17:47:09 +08:00
cxt 6ed0a151dc 头像下拉框的样式修改 2015-09-09 17:45:39 +08:00
lizanle f892beebc1 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-09 17:15:04 +08:00
lizanle 763939f176 这个可以不用了 2015-09-09 17:12:02 +08:00
sw 1bf90739be 调整从资源库选择资源到作业、作品中弹框的初始位置 2015-09-09 17:00:11 +08:00
sw 519f079bcc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-09 16:54:21 +08:00
sw adcd3b1ad5 去掉无用加载的js 2015-09-09 16:54:08 +08:00
sw 401b0bc7e3 textarea自动拉伸高度优化,编辑普通作业作品功能完成 2015-09-09 16:50:46 +08:00