Commit Graph

14406 Commits

Author SHA1 Message Date
huang 197f054c18 注释掉申请私有资源功能 2016-05-25 09:10:41 +08:00
huang d1e11d4260 代码审查后代码简化 2016-05-25 08:58:58 +08:00
cxt b1a58ecfb8 Merge branch 'weixin_guange' into develop
Conflicts:
	1234567
2016-05-24 20:51:24 +08:00
huang b38bd0c1e5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-24 20:13:42 +08:00
cxt ed2f413949 代码还原 2016-05-24 20:04:06 +08:00
cxt 7b7f9cf8f2 删除wechat无用代码 2016-05-24 19:52:51 +08:00
cxt 4ec0d6812b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-24 18:11:18 +08:00
huang 909d40b4eb 默认显示公共资源 2016-05-24 17:14:01 +08:00
cxt fc3b47e3aa 测验统计结果的js问题 2016-05-24 16:37:21 +08:00
yuanke 9e8411aac9 修改ke:issue描述只有一行,点击编辑后,描述框被拉高了,有很多空白 2016-05-24 16:22:46 +08:00
huang a4f2ebb73b Merge branch 'develop' into hjq_beidou 2016-05-24 16:12:27 +08:00
huang a7a2be6a4b 作业导入资源问题 2016-05-24 16:01:02 +08:00
Tim 1c0a68e57b 组织配置成员tab,搜索结果太多导致换页断行问题 2016-05-24 15:47:22 +08:00
Tim 65c7719ed2 设置大纲图标在讨论区换行显示问题 2016-05-24 15:18:11 +08:00
txz 29ceb7b8e9 微信图标清晰问题,回复点赞右对齐 2016-05-24 15:01:26 +08:00
cxt ccf29c980a 作业列表搜索作业:搜索结果中包括不包含关键字的作业、作业回复框加载不出 2016-05-24 10:34:36 +08:00
huang bc0e24d39e 资源引用代码注释 2016-05-24 10:28:17 +08:00
cxt 6af9e849d9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-24 09:51:45 +08:00
cxt 13676ec9c3 微信的链接修改 2016-05-24 09:51:27 +08:00
huang 61eeee702c migrate 2016-05-24 09:40:47 +08:00
huang ed7c6cbcfe 组织新建帖子增减status状态 2016-05-24 09:40:16 +08:00
txz 2a0b35a1b3 微信回复框高度随文字增减 2016-05-24 09:38:49 +08:00
yuanke e7d20c2b98 1.项目用户反馈、课程留言区增加自动识别URL功能
2.所有自动识别URL区域的链接颜色都改为#15bccf
2016-05-24 09:11:50 +08:00
huang b1c70db28a 上线暂时还原代码 2016-05-23 16:34:31 +08:00
cxt e62a4cc646 绑定新的微信公众号 2016-05-23 16:29:38 +08:00
huang 0e03798f6e 组织框架结构(yeild)修改 2016-05-23 16:24:32 +08:00
huang a3abf09841 delayjob封装 2016-05-23 16:04:06 +08:00
yuanke 5eff3db9e8 1.问答区时间排序BUG修复、只显示更新时间、发贴人放左下角、内容截断一点
2.KE编辑器输入内容时需有一点下边距
3.KE中编辑使用段落显示时有颜色的问题
2016-05-23 15:58:32 +08:00
huang 96223b414d Merge branch 'hjq_mail' into develop 2016-05-23 15:03:45 +08:00
huang d70f42b413 发布课程通知消息异步发送(测试版) 2016-05-23 15:03:22 +08:00
cxt 6586dfaf91 作品搜索时,复制的姓名或学号或邮箱因为包含空格,而搜索不到相关结果 2016-05-23 14:47:10 +08:00
cxt 2afce9d563 隐藏导入作业的申请题库 2016-05-23 14:05:28 +08:00
huang a60356091b issue中添加类型tag 2016-05-23 11:02:21 +08:00
cxt 820e594fec 题库的私有作业显示作业详情 2016-05-23 10:53:49 +08:00
huang e9c7ad9337 Merge branch 'develop' into hjq_beidou 2016-05-23 10:34:27 +08:00
txz 103af96ac2 替换加载中gif图 2016-05-23 10:26:17 +08:00
cxt c3ec7289b7 Merge branch 'develop' into cxt_course 2016-05-23 09:51:59 +08:00
huang eead7962cf 资源申请权限控制 2016-05-21 11:39:50 +08:00
huang 66709b16e5 Merge branch 'yuanke' into develop 2016-05-20 22:09:58 +08:00
huang 27d029271b Merge branch 'cxt_course' into develop 2016-05-20 22:08:45 +08:00
huang 86ff725b8a Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-20 22:08:32 +08:00
yuanke 76006ef3e7 组织一级二级帖子删除文章问题 2016-05-20 22:07:33 +08:00
huang 039d11e862 资源发送权限问题 2016-05-20 21:48:51 +08:00
Tim 51cd9c6dd1 学号溢出bug 2016-05-20 21:47:31 +08:00
huang 0fcd8ae86d 导入资源鼠标点击效果 2016-05-20 21:10:53 +08:00
huang c749fe381b Merge branch 'weixin_guange' into develop 2016-05-20 21:02:01 +08:00
huang cdde844e44 Merge branch 'cxt_course' into develop 2016-05-20 21:01:30 +08:00
huang f94806bcdf Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-20 21:01:18 +08:00
huang e512154ea9 古剑删除描述一致 2016-05-20 21:00:36 +08:00
huang d9241d5dca 组织栏目帖子设为首页后显示在栏目中 2016-05-20 20:55:43 +08:00