Commit Graph

10394 Commits

Author SHA1 Message Date
cxt 9f51b4e345 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-20 09:56:01 +08:00
cxt 90ee4bbe60 删除空的课程动态 2015-10-20 09:55:51 +08:00
ouyangxuhua d0c4230e69 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-10-20 09:49:26 +08:00
huang 357c04922a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-20 09:44:13 +08:00
huang 7157d09d03 Merge branch 'develop' into szzh 2015-10-20 09:43:57 +08:00
huang 1cfa8326aa 解决课程作业500问题 2015-10-20 09:43:22 +08:00
ouyangxuhua 50abd3785a 修改作业提示信息,在前面统一加上“某某您好!” 2015-10-20 09:42:26 +08:00
cxt dbbdae1be2 附件迁移文件的修改 2015-10-20 09:24:50 +08:00
cxt 9eeb468079 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-20 08:43:25 +08:00
huang 22376f5c08 Merge branch 'szzh' into develop 2015-10-19 18:40:20 +08:00
huang ce4da2e4af 去掉日志打印 2015-10-19 18:38:27 +08:00
cxt bf5360164c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-19 18:32:51 +08:00
huang dc1e72a64b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-19 18:30:41 +08:00
huang 588bc2ed98 页面显示公开/私有 2015-10-19 18:30:28 +08:00
ouyangxuhua ec1eddbf07 1.学生的“发布了作业”消息,链接到提交作业界面,而非作业提交列表;
2.开课学期具体到某年,如“秋季学期”,改为“2015年秋季学期”
2015-10-19 18:19:27 +08:00
cxt 263099aa25 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-19 17:35:10 +08:00
cxt 0b565b1be0 私有课程的课件迁移 2015-10-19 17:34:59 +08:00
Tim 787b3fa5d4 贴吧点赞图标颜色更换 2015-10-19 17:20:41 +08:00
lizanle 3386c53d76 Merge remote-tracking branch 'origin/szzh' into szzh 2015-10-19 17:10:25 +08:00
lizanle 4f1f34ac58 暂时屏蔽掉加入课程的分类情况 2015-10-19 17:10:10 +08:00
huang dc5721497e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-19 17:04:18 +08:00
lizanle 1f1a8e0770 管理员修改学校的功能 2015-10-19 17:04:15 +08:00
huang ddccbd59e1 Merge branch 'dev_hjq' into szzh 2015-10-19 17:03:48 +08:00
huang a8f5a7ea48 Merge branch 'szzh' into dev_hjq 2015-10-19 17:03:01 +08:00
huang 74284e1e71 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-10-19 17:02:03 +08:00
huang 7898208b16 私有课程上传资源都为私有 2015-10-19 17:01:47 +08:00
ouyangxuhua efbae1f003 修改作业消息的内容:把“你”统一改成“您”;发布作业是本人的话,改成“您发布了作业”,而非“某某老师发布了作业”等 2015-10-19 16:59:08 +08:00
Tim 39d347d5c2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-19 15:51:43 +08:00
Tim 2ca83bc7c4 学校修改界面修改 2015-10-19 15:51:27 +08:00
ouyangxuhua 4deeaa0f34 1.增加消息:用户迟交作业时,发送不能参与匿评的消息;
2.增加消息:用户创建课程时,发送创建课程消息。
2015-10-19 15:45:24 +08:00
cxt 9cf1278e99 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-19 15:42:42 +08:00
lizanle cf0fd2022d 课程创建动态 项目创建动态 2015-10-19 14:58:44 +08:00
huang 64fa435a3a Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 2015-10-19 14:03:25 +08:00
huang f189e3cde8 0 2015-10-19 14:03:08 +08:00
cxt 7359081fd2 开启匿评后学生不可删除作品附件 2015-10-19 13:58:05 +08:00
lizanle f914d21c3f Merge remote-tracking branch 'origin/szzh' into szzh 2015-10-19 09:55:32 +08:00
lizanle 5652a60c68 js函数节流 2015-10-19 09:55:19 +08:00
guange 65e6444272 . 2015-10-18 21:31:00 +08:00
guange 98bd46ceb4 通过url识别project 2015-10-18 21:24:59 +08:00
guange 74fd461fac . 2015-10-18 21:16:03 +08:00
guange acbd690bc6 添加转换页面 2015-10-18 21:04:04 +08:00
guange f1af041f24 gitlab key 更改 2015-10-18 13:56:10 +08:00
guange 07084a94c5 . 2015-10-18 13:50:59 +08:00
guange b80a0d6366 . 2015-10-18 13:25:10 +08:00
guange 01d716d61f Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 2015-10-18 13:20:40 +08:00
guange 3a21e9f2b0 修复重构错误 2015-10-18 13:16:58 +08:00
huang 765d2b875d 还原目录显示 2015-10-16 20:06:03 +08:00
cxt bfdfde8028 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-16 17:32:28 +08:00
cxt 7dd6618345 非课程成员不能将帖子置顶和锁定 2015-10-16 17:32:17 +08:00
ouyangxuhua 86cd27eb17 消息中,系统消息的标题显示“系统消息”,而非“消息” 2015-10-16 17:30:46 +08:00