Commit Graph

14215 Commits

Author SHA1 Message Date
yuanke c3c639aa77 超链接颜色修改 2016-06-02 15:27:16 +08:00
yuanke 0d38fa53a2 1.issue编辑器定下最高高度到了改为滚动条
2.提问和建议修改提示语
3.KE插入代码框去掉我要回复字样
4.自动识别URL优化可识别? 和cn等
5.KE缩进修改等
2016-06-02 13:55:40 +08:00
yuanke e650dca1ed 修改用户反馈中二级回复 回复框不消失的问题 2016-05-27 17:06:34 +08:00
yuanke 98244d2a3d 将文章标题的颜色恢复正常 2016-05-27 16:42:05 +08:00
yuanke 5b7011e07b Merge branch 'develop' into yuanke 2016-05-27 15:37:11 +08:00
yuanke d08809bfbd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/project.css
2016-05-27 15:34:55 +08:00
yuanke 9d9e2ff613 自动识别URL正则匹配修改 2016-05-27 15:31:13 +08:00
huang ff14809237 Merge branch 'cxt_course' into develop 2016-05-27 15:30:35 +08:00
huang 5e2a4342fa Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-27 15:30:19 +08:00
huang 3ba4d09336 Merge branch 'weixin_guange' into develop 2016-05-27 15:29:25 +08:00
huang a207f48b94 Merge branch 'hjq_mail' into develop
Conflicts:
	app/models/news.rb
2016-05-27 15:27:02 +08:00
huang 649b3918c4 通知、消息创建的时候异步发送消息 2016-05-27 15:25:27 +08:00
cxt 227a668413 分组匿评的显示 2016-05-27 15:15:14 +08:00
cxt 7599bf75a3 分组作业不关联项目时的作品列表样式调整 2016-05-27 15:04:56 +08:00
huang 9e17db376a 解决组织一级目录二级目录匿名用户问题 2016-05-27 14:44:28 +08:00
cxt 400a470a2b 作品列表的样式调整 2016-05-27 14:42:12 +08:00
cxt 03d70e8c9a 作品列表:当先进行作品搜索或选择分班操作后,然后点击“隐藏作业信息”,再点击“显示作业信息”无反应 (测验列表也一起修复了) 2016-05-27 14:27:54 +08:00
cxt 3b33732e6f 学生列表的姓名、学号、分班和加入时间做成不可点击的 2016-05-27 14:15:26 +08:00
txz 29faa015ab 微信图标替换,增加空值回复赞文字 2016-05-27 14:01:16 +08:00
yuanke cfc3751f6f Merge branch 'yuanke' into develop 2016-05-27 14:01:02 +08:00
huang c7bf29b0c9 组织切换问题 2016-05-27 12:46:11 +08:00
cxt 3b84cd3ed2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-27 11:07:42 +08:00
cxt 1fa6ac89ce 微信的配置 2016-05-27 11:07:27 +08:00
huang 25aaa4b5bc 铃铛、搜索颜色 2016-05-27 11:07:27 +08:00
huang afedaf3fe5 组织资源历史版本下载权限问题 2016-05-27 10:48:28 +08:00
huang f3a1a7371d 资源过多最下面点击更新版本的时候弹框没有居中 2016-05-27 10:43:50 +08:00
huang 7b6a62e972 历史版本下载403问题 2016-05-27 10:34:57 +08:00
huang fb46062640 项目、课程、组织资源列表发送无法弹框问题 2016-05-27 10:20:15 +08:00
huang 213b0f75b0 Merge branch 'hjq_resource' into develop 2016-05-27 09:33:44 +08:00
huang ab4aa0f06f 公共资源多个资源发送功能 2016-05-27 09:32:24 +08:00
cxt 99c1821b4e Merge branch 'weixin_guange' into develop 2016-05-27 08:56:26 +08:00
cxt b065184754 删除机器人组织的匿名评论 2016-05-27 08:54:31 +08:00
txz 9134e55606 动态纯文本模式,图标处理 2016-05-26 17:40:22 +08:00
txz 55b3751beb Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-05-26 17:21:15 +08:00
txz e7039df875 微信点击跳转区域更改,内容字体大小颜色更改 2016-05-26 17:21:02 +08:00
cxt 0cac1e99c7 微信动态的描述过滤掉html 2016-05-26 17:18:58 +08:00
cxt 6fea9c2ba8 微信文字和图片的显示 2016-05-26 17:14:52 +08:00
yuanke 54e62c778a 保证python编程的中文注释可用 2016-05-26 15:49:50 +08:00
cxt ff974d6901 Merge branch 'weixin_guange' into develop
Conflicts:
	app/views/wechats/login.html.erb
2016-05-26 15:32:00 +08:00
cxt 4d5ee5a722 微信的欢迎图片及欢迎词的修改,测试版的配置 2016-05-26 15:27:31 +08:00
yuanke 9603115a86 KE编辑时链接的颜色改为和显示的时候一样并将下划线去掉 2016-05-26 14:02:17 +08:00
txz 8fbe4d636c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-05-26 13:48:13 +08:00
txz 7bb94d9df4 详情页面将内容和框架同时显示 2016-05-26 13:47:23 +08:00
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