Commit Graph

14157 Commits

Author SHA1 Message Date
cxt 82568b5951 缺陷状态更改或内容更改时不发模板消息 2016-05-20 11:39:30 +08:00
cxt 6aa20c9edf 消息通知的内容没有过滤用Tab键空格引起的特殊符号 2016-05-20 11:12:37 +08:00
huang 80f829c018 解决搜索不能用的问题 2016-05-20 10:48:17 +08:00
huang 92f55e0dc1 公共资源库,点击底部不能发送的问题 2016-05-20 10:02:59 +08:00
cxt b03b9a3c27 课程:问卷导入时显示的数据未进行过滤 2016-05-20 09:59:41 +08:00
Tim b0fba934ae Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-19 17:24:11 +08:00
huang f806dbf587 资源发送至组织和课程 2016-05-19 17:12:33 +08:00
huang e0370e3e32 私有资源中发送文件 2016-05-19 17:04:46 +08:00
huang 1402f2076a 资源申请添加链接 2016-05-19 16:53:22 +08:00
yuanke 0dd7aae08c 先注释自动识别URL 2016-05-19 16:39:23 +08:00
cxt df70c33bcd 学生列表活跃度为0 2016-05-19 16:39:14 +08:00
yuanke ed58e78065 KE表格颜色问题 2016-05-19 16:38:48 +08:00
yuanke 5b0ef6ada0 Merge branch 'develop' into yuanke 2016-05-19 16:30:02 +08:00
yuanke 6e749f49e4 Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke 2016-05-19 16:29:33 +08:00
yuanke 7da1418069 自动识别URL 2016-05-19 16:24:57 +08:00
huang 4857769c49 Merge branch 'yuanke' into develop 2016-05-19 16:11:06 +08:00
huang fe54a19940 Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
Conflicts:
	app/views/blogs/_article.html.erb
	app/views/users/_project_boardlist.html.erb
	public/stylesheets/new_user.css
2016-05-19 16:10:18 +08:00
huang faf5e89cc2 Merge branch 'weixin_guange' into develop
Conflicts:
	1234567
	app/views/blogs/_article.html.erb
	db/schema.rb
2016-05-19 16:04:27 +08:00
huang 3985c190bf Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-05-19 16:01:07 +08:00
huang 984f706722 可发送权限控制 2016-05-19 15:59:59 +08:00
cxt 3ebef0eae2 消息通知中申请引用作业的用户点击申请的消息打开没有权限访问的页面 2016-05-19 15:57:20 +08:00
cxt 6517f23f03 首页不显示项目的创建动态 2016-05-19 15:26:23 +08:00
txz 66042cb3c9 debug false 2016-05-19 15:21:25 +08:00
txz e2f3ba8e7d 微信问题修改 2016-05-19 15:20:46 +08:00
cxt 05a475e47e 微信动态中不应出现已删除的项目和课程动态 2016-05-19 14:35:40 +08:00
huang 0b2f6c9a53 私有资源的搜索和排序 2016-05-19 14:28:13 +08:00
cxt 0f2f4717b6 作业列表增加序号和翻页、按创建时间倒排 2016-05-19 13:50:45 +08:00
huang 4c68da9bee 修正链接资源名 2016-05-19 13:49:29 +08:00
txz 278ee66368 系统冲突 2016-05-19 13:47:08 +08:00
txz 1b3bc38f8e 拖代码改动 2016-05-19 13:44:03 +08:00
huang bddc807057 修正资源库弹框位置 2016-05-19 13:41:32 +08:00
huang 99cbf0b54e 资源引用消息通知 2016-05-19 11:32:58 +08:00
Tim 65a181b75e Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-19 09:24:39 +08:00
huang f3f75a57bd 申请资源消息资源发布这收到消息 2016-05-18 17:37:48 +08:00
cxt 31d94dc052 发布可引用的作业至课程,作业的原作者不应收到微信消息提醒 2016-05-18 16:28:43 +08:00
yuanke c208b79e2d 代码测试上面的语言右边 加上编译器信息 2016-05-18 16:23:28 +08:00
cxt 670b2c48c7 缺陷的模板消息要细化缺陷类型 2016-05-18 16:08:40 +08:00
yuanke 52724bd9ed KE ol ul标签增加margin-bottom:0 2016-05-18 15:11:53 +08:00
cxt 3b3cafbc81 微信模板消息的还原 2016-05-18 14:49:49 +08:00
huang 658ea0cf1e 资源引用 结构搭建 数据创建 2016-05-18 14:49:13 +08:00
yuanke 0e016eed2a KE上传非图片格式时弹框用新的,博客帖子发帖时间改为发布 2016-05-18 14:15:39 +08:00
cxt 617649129e Gemfile 2016-05-18 11:20:14 +08:00
cxt 28edaf2246 课程/项目留言:快速点击提交按钮重复产生多条记录的问题 2016-05-18 10:57:56 +08:00
huang 615d0ddbd2 公共资源、私有资源请求分享界面及样式 2016-05-17 16:45:11 +08:00
cxt 357e143c9a Merge branch 'develop' into cxt_course
Conflicts:
	db/schema.rb
2016-05-17 16:30:03 +08:00
guange 1767e1200d school不用Base64解码,两边都是utf8 2016-05-17 15:56:06 +08:00
yuanke 0ac7163b05 KE修改居中换行居中消失的问题 2016-05-17 15:55:24 +08:00
cxt ddafa79835 无法展开隐藏楼层 2016-05-17 15:52:24 +08:00
cxt 55a98d8d6e 作业二级回复的消息通知 2016-05-17 15:33:16 +08:00
huang 07678e367e 资源新样式删除功能 2016-05-17 15:32:18 +08:00