Commit Graph

16610 Commits

Author SHA1 Message Date
yuanke 930acd382c 微信图片点击调试 2016-09-20 15:14:48 +08:00
yuanke 4e29242579 调试 2016-09-20 15:11:00 +08:00
yuanke 9b4e146577 . 2016-09-20 15:00:22 +08:00
yuanke 8bb1323612 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
	public/assets/wechat/edit_userinfo.html
2016-09-20 14:59:40 +08:00
yuanke 8b771a183c 微信分班功能 2016-09-20 14:58:37 +08:00
Tim 2856cd06d5 微信图片内容点击可放大 2016-09-20 14:42:36 +08:00
huang 4d97dd3889 去掉项目module中dts测试工具 2016-09-19 17:22:30 +08:00
cxt ba4a1c64d9 作业动态的重构 2016-09-19 17:14:14 +08:00
huang 8e6a88f7d8 项目日历功能 2016-09-19 16:19:59 +08:00
Tim 8d2636e3e6 甘特图css样式引用 2016-09-19 15:43:40 +08:00
huang 7ed7129ace 甘特图和日历显示及CSS架构 2016-09-19 14:23:33 +08:00
Tim 9c214ef57b 个人资料文字提示 2016-09-19 14:07:32 +08:00
Tim 126c18f833 我的资源页面来源宽度调整;班级动态详情页面显示课程名 2016-09-19 14:00:52 +08:00
Tim abb3f942fa Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-19 13:54:04 +08:00
yuanke 5b61396410 微信课程名 2016-09-19 13:53:15 +08:00
Tim 0c0e865a20 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-19 13:23:22 +08:00
yuanke 3624d9d4ca 微信增加分班相关功能 2016-09-19 13:22:29 +08:00
Tim 7a5f21456d 微信页面名字为空时,提示文字显示 2016-09-19 11:24:44 +08:00
huang 815c5b06a7 Merge branch 'develop' into rep_quality 2016-09-19 08:55:52 +08:00
cxt 6809085215 Merge branch 'develop' into cxt_course 2016-09-19 08:50:48 +08:00
cxt 9a8ff23984 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-18 17:01:21 +08:00
cxt fa82860813 项目讨论区动态的过滤 2016-09-18 17:01:08 +08:00
huang 030056fd0d 项目讨论区附件下载权限 2016-09-18 16:51:52 +08:00
yuanke 4c8144d86b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-18 16:48:29 +08:00
yuanke fe431902d7 修改留言的at微信相关BUG 2016-09-18 16:48:20 +08:00
Tim 35bcde1438 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-18 16:47:29 +08:00
Tim 97394a6cbe 显示课程名称与班级名称 2016-09-18 16:47:13 +08:00
cxt dd825a6426 config/environments/production.rb 这个文件添加到忽略 2016-09-18 16:26:47 +08:00
huang 493beefad0 Merge branch 'develop' into rep_quality 2016-09-18 16:15:41 +08:00
yuanke 04a2effcee 微信增加分班相关 2016-09-18 16:12:38 +08:00
huang 728e1333fc issue author为空处理 2016-09-18 15:58:55 +08:00
huang 924db06cbf 项目版本库隐藏代码统计 2016-09-18 15:55:22 +08:00
huang a3467a5697 项目课程讨论区资源公开迁移 2016-09-18 15:53:32 +08:00
huang ec8053b248 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-18 15:44:43 +08:00
huang 5b938aa11b 课程项目讨论区非成员现在资源权限 2016-09-18 15:44:27 +08:00
cxt fc630b9322 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-18 15:11:20 +08:00
cxt 19721e20c5 Merge branch 'cxt_course' into develop 2016-09-18 15:11:11 +08:00
cxt 014b43cccd oneapm添加到忽略 2016-09-18 15:09:43 +08:00
cxt f50663158a 新建班级页面的提示调整 2016-09-18 15:07:22 +08:00
cxt 2c7eddbae6 个人留言的at回复报错 2016-09-18 14:49:01 +08:00
cxt 3f7935bf85 班级/项目帖子锁定回复的,已有回复的二级回复按钮未屏蔽 2016-09-18 14:39:03 +08:00
huang 8aba516d1e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-18 14:21:02 +08:00
liguangye 53bdeed1e4 解决铃铛404问题 2016-09-18 14:20:08 +08:00
yuanke b783ec5b44 . 2016-09-18 13:19:37 +08:00
yuanke 98aaca3572 Merge branch 'develop' into weixin_guange 2016-09-18 13:07:51 +08:00
cxt 6c093f68cf 班级内的成员可以将帖子、通知、资源等发送到该班级 2016-09-18 11:18:02 +08:00
yuanke 65bd77f0ff 微信二维码过期问题修改 2016-09-18 10:50:40 +08:00
huang cfc5a2457c 课程500问题 2016-09-17 11:26:29 +08:00
cxt b468134e3e Merge branch 'cxt_course' into develop 2016-09-14 21:19:01 +08:00
cxt 0d12acd42a 样式修改 2016-09-14 21:11:20 +08:00