Commit Graph

7394 Commits

Author SHA1 Message Date
huang c72f522493 邮件按天发送中添加wiki 2015-06-10 16:58:22 +08:00
sw a5d7c50fe3 课程通知展开按钮 2015-06-10 16:39:28 +08:00
sw 57804a118d 课程作业列表中展开按钮 2015-06-10 16:37:18 +08:00
sw 94e8bd13ab 资源作者 2015-06-10 16:24:11 +08:00
sw ff159075aa 新header课程在项目上面 2015-06-10 16:16:23 +08:00
sw 1c808464d5 新版编辑器不可以拉宽 2015-06-10 16:12:19 +08:00
guange 56f522f563 解决IE浏览器中--课程作业打包下载的文件名乱码 2015-06-10 15:36:11 +08:00
guange 25ac0100c7 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-06-10 15:20:52 +08:00
guange 89f71ffa46 解决相关资源后的下载图标按钮后就直接预览了,不合适缺陷 2015-06-10 15:19:59 +08:00
sw 574c7373ec Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-10 15:16:54 +08:00
huang 8609e9efc8 Merge branch 'szzh' into dev_hjq 2015-06-10 15:04:03 +08:00
huang f94c13d0e6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-10 15:03:18 +08:00
huang 0d9bdae5b0 邮件按天发送新界面 2015-06-10 15:02:44 +08:00
sw e1636d20d0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-10 10:32:51 +08:00
yutao 918d03d4dd ... 2015-06-10 10:29:17 +08:00
sw f3dd7c11b6 提交问卷答案时样式调整 2015-06-09 17:11:54 +08:00
sw 4c5d2d5055 poll列表界面样式调整,导出功能权限 2015-06-09 17:08:00 +08:00
sw 857d3d5f62 问卷调查结果导出功能 2015-06-09 17:03:28 +08:00
yutao 4ed4d3fa44 ... 2015-06-09 16:21:19 +08:00
yutao 63785564e8 解决图片上传不支持多编辑器的bug 2015-06-09 16:06:26 +08:00
sw d29353dd1a Merge branch 'szzh' into develop 2015-06-09 14:11:27 +08:00
sw f18367d550 Merge branch 'dev_hjq' into szzh 2015-06-09 14:11:12 +08:00
huang dd27e1c301 Merge branch 'szzh' into dev_hjq 2015-06-09 13:01:36 +08:00
huang 46952212e4 Merge branch 'dev_hjq' into szzh 2015-06-09 13:00:11 +08:00
huang 05a77caeda 去掉讨论区重复及统计数量错误 2015-06-09 12:58:54 +08:00
lizanle 0847002995 Merge remote-tracking branch 'origin/szzh' into szzh 2015-06-08 17:16:39 +08:00
lizanle 7d76b20574 作业那块逻辑修改,对于作业的学生提问以及回复功能需要取消 2015-06-08 17:16:34 +08:00
huang 8375332f4d Merge branch 'dev_hjq' into szzh 2015-06-08 15:59:02 +08:00
huang f2482404f9 Merge branch 'szzh' into dev_hjq 2015-06-08 15:58:06 +08:00
sw 0ba7b68e1a Merge branch 'szzh' into develop 2015-06-08 15:57:40 +08:00
huang f0879ba536 Merge branch 'dev_hjq' into szzh 2015-06-08 15:55:01 +08:00
huang 7c6b861c9d Merge branch 'szzh' into dev_hjq 2015-06-08 15:53:27 +08:00
huang 999e96a857 取消掉打印attachment 2015-06-08 15:45:12 +08:00
yutao 29edf5ece7 解决kindeditor多编辑器的bug 2015-06-08 14:46:25 +08:00
huang 4f9459dfef Merge branch 'szzh' into dev_hjq 2015-06-08 14:38:59 +08:00
huang 370bae787f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-08 14:32:44 +08:00
huang 52f7c66ff0 修复课程讨论区中邮件通知重复的问题 2015-06-08 14:32:10 +08:00
lizanle 949356c37b Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
	db/schema.rb
2015-06-08 09:07:55 +08:00
lizanle 0e2db5fc73 schema 2015-06-08 09:07:32 +08:00
sw da9a607a5b 第一次评论后添加附件,评论不刷想 2015-06-06 16:11:37 +08:00
huang 38e4d90a1c Merge branch 'dev_hjq' into szzh 2015-06-06 12:14:23 +08:00
sw e52751f5e0 Merge branch 'szzh' into develop 2015-06-06 12:13:37 +08:00
sw d477d44d4b Merge branch 'dev_hjq' into szzh 2015-06-06 12:13:00 +08:00
huang 18f0c6fa0c Merge branch 'szzh' into dev_hjq 2015-06-06 12:11:28 +08:00
sw 6a997bace3 学生姓名颜色调整
匿评列表学号显示--
2015-06-06 12:11:19 +08:00
huang ffa3d479c0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-06 12:10:43 +08:00
huang 5a9e3c685b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-06-06 11:40:03 +08:00
huang 543ae1bbd0 修改邀请加入项目逻辑:改成已加入和等待加入 2015-06-06 11:39:22 +08:00
sw da4127245f Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-06-06 10:22:57 +08:00
huang 7e89cd27aa 邮件邀请bug修改 2015-06-06 10:22:56 +08:00