Commit Graph

7252 Commits

Author SHA1 Message Date
yutao 0ca913bc83 ... 2015-06-12 11:55:29 +08:00
yutao dbb6c9f54c ... 2015-06-12 11:21:49 +08:00
yutao 3c515dd077 ... 2015-06-12 10:52:15 +08:00
yutao f7e0ad9fc3 ... 2015-06-12 10:09:47 +08:00
yutao 6929694fb4 个人主页留言换编辑器 2015-06-11 18:16:23 +08:00
yutao e99206ff4a 项目留言换编辑器 2015-06-11 17:31:47 +08:00
huang 9c0454d4fa Merge branch 'dev_hjq' into szzh 2015-06-11 16:37:46 +08:00
huang 5c36cf5c9d Merge branch 'szzh' into dev_hjq 2015-06-11 16:36:19 +08:00
huang 2a74509fd9 邮件显示页面项目括号颜色 2015-06-11 16:33:33 +08:00
huang a4f1edcdee 更新:wiki项目其它成员可以收到;
项目、课程留言其它成员可以收到
邮件显示页面国际化
2015-06-11 16:30:14 +08:00
yutao de3bb64fd9 课程讨论区换编辑器 2015-06-11 16:24:09 +08:00
sw b44f5ef522 弹出框显示为作业名称 2015-06-11 15:47:55 +08:00
sw f956b27953 作业积分显示平均分 2015-06-11 15:31:22 +08:00
huang 7bf4cfd218 修改个人留言在按天发送中查询条件 2015-06-11 10:40:55 +08:00
huang 15697e05ed 按天发送中添加项目留言 2015-06-11 10:02:27 +08:00
sw 5d5159f4c7 助教也可在个人首页关闭课程 2015-06-10 16:58:48 +08:00
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
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 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
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