Commit Graph

7472 Commits

Author SHA1 Message Date
sw f395967ac9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-30 16:37:03 +08:00
sw fa31fe421b 匿评列表导出Excel 2015-06-30 16:36:37 +08:00
sw d7d87c6999 修改作业后,作业创建者会变为当前修改人 2015-06-30 15:32:10 +08:00
sw c2e21f7a0c 缺评列表导出 2015-06-30 15:30:51 +08:00
sw 156f2f9a2e 部分评分数据重复 2015-06-30 14:30:11 +08:00
sw 88130a4d92 1、缺评情况admin用户可以看到,切作业的任何阶段都可以看到
2、应评数改为匿评分配数量
2015-06-30 11:16:15 +08:00
huang 4f23ef9cfe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-30 10:35:40 +08:00
huang dd33210d05 区分缺陷回复合主贴 2015-06-30 10:35:20 +08:00
sw af97f3bea8 课程作业、通知展开按钮居右 2015-06-30 10:18:46 +08:00
sw 59f6ef81cd 附件提示框固定位置 2015-06-30 10:15:04 +08:00
sw 3e6ccf3e50 作业截至之前不能启动匿评页面 2015-06-30 09:47:54 +08:00
sw 7fa45a47bb 作业截至之前启动匿评给出提示 2015-06-29 10:59:39 +08:00
sw 306970558a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-29 10:36:56 +08:00
lizanle ddb705b658 Merge remote-tracking branch 'origin/szzh' into szzh 2015-06-26 17:16:10 +08:00
lizanle 09b6f1d787 修改news api 2015-06-26 17:16:03 +08:00
huang fec5378ed3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-26 17:08:05 +08:00
huang 65ee86bb45 1,解决git中英文500错误
2.解决编辑器输入样式邮件显示异常问题
2015-06-26 17:07:31 +08:00
sw 302d0356e9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-26 17:06:13 +08:00
sw 90c4a38cfc 公共贴吧头像显示问题 2015-06-26 17:00:33 +08:00
sw bb9c46a632 课程留言回复,回复内容和时间在同一行 2015-06-26 16:27:55 +08:00
sw 5a23918304 Merge branch 'develop' into szzh 2015-06-26 15:20:32 +08:00
sw 19c474e422 超级管理员可以查看学生列表、教师列表 2015-06-26 15:13:53 +08:00
sw 2598894a59 Merge branch 'szzh' into develop 2015-06-26 14:47:25 +08:00
huang 801cddecfe Merge branch 'dev_hjq' into szzh 2015-06-26 14:46:52 +08:00
sw 3f365ef3b3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-26 14:46:47 +08:00
sw 66eba14dfe 课程首页加入课程样式
课程首页    公开资源-->资源
2015-06-26 14:46:37 +08:00
huang 284703c386 Merge branch 'szzh' into dev_hjq 2015-06-26 14:45:42 +08:00
huang df910a9c2d 更改邮件提示语(同步国际化) 2015-06-26 14:44:26 +08:00
sw 399fc447f5 快速加入项目弹框滚动条 2015-06-26 14:31:08 +08:00
sw 0f92a2e3cb 下载附件给出使用winrar解压的提示 2015-06-26 14:29:03 +08:00
sw 218246239b 个人主页图片超出 2015-06-26 13:54:39 +08:00
sw 0215d2224e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-26 13:41:33 +08:00
lizanle c9a614d520 Merge remote-tracking branch 'origin/szzh' into szzh 2015-06-26 10:22:37 +08:00
lizanle f32c76c7a2 字段名字错误 2015-06-26 10:22:30 +08:00
yutao 5e29c6bf27 bug#2742:项目问题跟踪:新建问题时在描述中直接贴图,若图片长度够长,在个人动态中显示超出边框 2015-06-26 10:14:26 +08:00
huang 2cf14bf3e6 Merge branch 'dev_hjq' into szzh 2015-06-26 10:10:35 +08:00
huang 3962b20f25 Merge branch 'szzh' into dev_hjq 2015-06-26 10:09:37 +08:00
huang 9b8475db30 Merge branch 'dev_hjq' into szzh 2015-06-26 10:06:31 +08:00
huang e88d71db57 Merge branch 'szzh' into dev_hjq 2015-06-26 10:05:41 +08:00
huang 5d0cd4520e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-26 10:04:48 +08:00
huang cd43a906b9 Merge branch 'dev_hjq' into szzh 2015-06-26 10:03:42 +08:00
huang cf0e1b3bd5 修改缺陷:上传名称较长的资源,文字被截断了 2015-06-26 09:47:58 +08:00
yutao e6a15a45c4 bug#2782:讨论区:若某一级回帖是视频,再二级回复该回复信息,显示时超出边框 2015-06-26 09:42:17 +08:00
lizanle a8377f7dcb 讨论区模型 2015-06-26 09:19:23 +08:00
lizanle 2ba87477fa Merge remote-tracking branch 'origin/szzh' into szzh 2015-06-26 09:18:39 +08:00
lizanle e5082ff489 新版课程动态 课程作业展示 2015-06-26 09:18:12 +08:00
yutao ffd254b7bb bug#2920:课程通知:对课程通知进行评论时,不输入字符,点击ENTER键也可以保存评论 2015-06-26 09:16:37 +08:00
huang 4092077923 不同课程邮件多条记录按desc排序 2015-06-25 16:34:02 +08:00
sw e1d6891895 课程默认logo 2015-06-25 16:13:42 +08:00
sw 620fd4230e 开启匿评后对已分配到匿评作品的学生的提示 2015-06-25 16:06:32 +08:00