Commit Graph

10243 Commits

Author SHA1 Message Date
ouyangxuhua ab97ba4aa0 增加请求加入课程消息 2015-10-20 17:31:58 +08:00
lizanle 0fffed55a6 Merge remote-tracking branch 'origin/szzh' into szzh 2015-10-20 17:27:14 +08:00
lizanle a817c3b81e 添加身份 2015-10-20 17:27:06 +08:00
huang 511fda0b40 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-20 16:26:29 +08:00
huang 9e7adaf5bc Merge branch 'dev_hjq' into szzh 2015-10-20 16:26:08 +08:00
ouyangxuhua 87b4c83247 修改不能参与匿评消息的关联删除;
看完消息后,更新相应的字段。
2015-10-20 16:19:32 +08:00
cxt edf3cc9cc8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-20 16:04:42 +08:00
cxt cc59b4c877 课程讨论区编辑帖子报错 2015-10-20 15:15:18 +08:00
lizanle 5da45ac806 Merge remote-tracking branch 'origin/szzh' into szzh 2015-10-20 14:39:13 +08:00
lizanle a8b4bde77c 学校列表div 下拉分页 最大页 计算方法错误 2015-10-20 14:38:24 +08:00
huang 5a5cf430d3 0 2015-10-20 14:24:18 +08:00
huang af4523815c 课程从公开改成私有
则该课程中所有的资源都变成私有
2015-10-20 11:03:47 +08:00
huang c9eb7b4b90 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-20 10:48:05 +08:00
huang 290e61599f 对课程资源公开私有单独处理 2015-10-20 10:47:51 +08:00
Tim c4907531dc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-20 10:33:11 +08:00
cxt 0ee2d557cf Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-20 10:31:25 +08:00
Tim 17afc1a9fe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-20 10:31:18 +08:00
cxt 1808cf34f2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-20 10:31:01 +08:00
Tim e11d5fccd4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-20 10:30:40 +08:00
huang b172fa7512 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-20 10:30:22 +08:00
huang 515dad66e2 课程资源库附件单独JS实现 2015-10-20 10:30:09 +08:00
Tim 1dd0954a94 意见反馈宽度调整 2015-10-20 10:29:51 +08:00
ouyangxuhua a5c220eac9 Merge branch 'dev_hjq' into szzh 2015-10-20 10:29:42 +08:00
cxt 03af199960 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-20 10:28:26 +08:00
cxt d049a00655 删除课程动态中未发布问卷的动态 2015-10-20 10:28:16 +08:00
Tim ad77104485 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-20 10:23:03 +08:00
Tim f59593cc1c 学校信息修改样式更改 2015-10-20 10:22:47 +08:00
huang ffc42e22f2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-20 10:11:58 +08:00
huang b3cd3c48d2 修改私有样式 2015-10-20 10:11:43 +08:00
lizanle 4c4188835a Merge remote-tracking branch 'origin/szzh' into szzh 2015-10-20 10:11:22 +08:00
lizanle 9330418668 学校列表div 下拉分页 2015-10-20 10:11:07 +08:00
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