Commit Graph

14222 Commits

Author SHA1 Message Date
guange b48b1c97b3 weixin 2016-05-26 13:02:27 +08:00
guange d034474f90 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-05-26 12:59:33 +08:00
guange e4653426d2 将openid存到session 2016-05-26 12:59:15 +08:00
txz 1c95e76209 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-05-26 10:55:18 +08:00
txz c73ce61afe 微信动态可点击,icon图片替换 2016-05-26 10:55:00 +08:00
guange a3d90df5ce delete unuse file 2016-05-26 10:51:39 +08:00
guange 01428fad14 merge 2016-05-26 10:51:01 +08:00
huang 0a7d1f1efc 公共资源库添加资源多个发送功能,修复项目、课程多个发送的bug 2016-05-25 17:54:53 +08:00
yuanke 192258a82d 1.取消KE编辑时候段落的上下边距
2.先编号后段落 可以切换段落样式  正文还不能切换
2016-05-25 17:04:46 +08:00
cxt 8257770ec9 课程和项目留言的点赞 2016-05-25 16:20:01 +08:00
cxt c8467a50a0 自己可以给自己点赞 2016-05-25 16:19:41 +08:00
cxt 5c9ec49457 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-25 15:27:00 +08:00
cxt 09b831c189 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-25 14:57:59 +08:00
cxt d9bd13c2fc 复制课程报500 2016-05-25 14:57:46 +08:00
txz 921b01e8e3 输入框支持文字内容滑动 2016-05-25 14:26:49 +08:00
huang 457cf72263 断行样式
发送JS
2016-05-25 14:08:05 +08:00
txz c4c0dd3c60 回复内容换行符未显示 2016-05-25 13:50:59 +08:00
huang 72ae31b7f9 作业导出资源代码回复 2016-05-25 11:23:19 +08:00
yuanke fcaa9666e2 KE内容自动识别网址加上超链接时把颜色也加上 2016-05-25 10:37:35 +08:00
yuanke 46860a838b 1.设置表格边框后所有的表格线宽度都一样
2.KE改变字体后再点击字体会标明当前的字体
2016-05-25 10:34:09 +08:00
huang b6de2dbd2d 发布作业导入资源 2016-05-25 09:44:30 +08:00
huang d75943efe5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-25 09:11:26 +08:00
huang 197f054c18 注释掉申请私有资源功能 2016-05-25 09:10:41 +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
cxt fc3b47e3aa 测验统计结果的js问题 2016-05-24 16:37:21 +08:00
yuanke 9e8411aac9 修改ke:issue描述只有一行,点击编辑后,描述框被拉高了,有很多空白 2016-05-24 16:22:46 +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
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 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