jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
15,928 Commits 98 Branches 0 Tags 0 B
Commit Graph

3506 Commits

Author SHA1 Message Date
huang 463c09f02c 项目邀请弹框 2016-07-26 08:55:07 +08:00
yuanke 04e9551450 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-26 08:52:52 +08:00
guange 6a871e2116 . 2016-07-25 17:09:14 +08:00
yuanke 4f803ce0de Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-25 17:02:52 +08:00
yuanke db7c267a47 微信单个项目动态 2016-07-25 17:02:42 +08:00
guange 9d2900d58f 解决没绑定用户不跳转到绑定页问题 2016-07-25 16:59:52 +08:00
txz 12e845c3ab 课程列表与项目列表样式统一 2016-07-25 15:31:44 +08:00
yuanke b9b9a867f4 项目 2016-07-25 15:20:01 +08:00
cxt 6c7925a7b4 样式调整 2016-07-22 18:20:11 +08:00
huang 0e1a52726f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/base_syllabus.html.erb
 2016-07-22 16:46:01 +08:00
txz 216d590140 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-22 16:44:20 +08:00
txz c4f4908c62 资源tab定位 2016-07-22 16:44:16 +08:00
huang 4d79f93079 Merge branch 'cs_optimize_txz' into develop 2016-07-22 16:43:17 +08:00
yuanke cedd7ae520 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-22 16:42:47 +08:00
yuanke 37a6adf428 二级回复代码统一写到comment_reply里面 2016-07-22 16:42:34 +08:00
cxt 27afee03b2 编辑课程的英文名称时输入框不清空 2016-07-22 16:38:09 +08:00
txz 7d2ba823e9 缓存动态页tab，详情返回到对应tab页 2016-07-22 16:26:43 +08:00
txz cef08a717c 课程名称过长时，邀请码无法点击bug 2016-07-22 16:09:47 +08:00
yuanke cdb7782849 除了issue 和news都增加了二级回复显示 2016-07-22 15:37:25 +08:00
cxt 9422e2886c 新版班级主页 2016-07-22 15:32:37 +08:00
cxt 1e28ff880d 新版课程大纲 2016-07-22 10:20:28 +08:00
yuanke 178222858c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-21 17:37:18 +08:00
yuanke 16fef58885 发送班级界面不显示没班级的课程 2016-07-21 17:37:03 +08:00
txz b638f9aea6 tab页issue标题改为问题 2016-07-21 17:33:20 +08:00
txz 19781ded4e 输入框padding调整 2016-07-21 17:22:03 +08:00
txz 8fd915bf1a issue标题改为问题 2016-07-21 17:18:09 +08:00
yuanke 0622978920 微信新用户注册后返回公众号 2016-07-21 16:59:47 +08:00
yuanke 9ababc5aa4 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-21 16:50:32 +08:00
yuanke 5a8f1b3d83 绑定成功后返回公众号 2016-07-21 16:50:15 +08:00
txz 00c3e880e6 微信详情页面返回定位js 2016-07-21 16:21:00 +08:00
txz 4a58777bb9 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-21 15:56:31 +08:00
txz 0a0f8aefac 微信加入班级弹框css兼容；app页面meta标签修改 2016-07-21 15:56:27 +08:00
yuanke 86731c34d5 单个课程作业不显示的BUG修改，加入班级时如果班级已被删除需要提示! 2016-07-21 15:21:09 +08:00
cxt 71b5fe1273 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/issues_controller.rb
	app/views/issues/_issue_replies.html.erb
	app/views/issues/_issue_reply_ke_form.html.erb
	db/schema.rb
 2016-07-21 14:31:43 +08:00
yuanke f0840d0f31 Merge branch 'develop' into weixin_guange 2016-07-21 14:29:04 +08:00
cxt 60bbe89c0d 博客的自动保存 2016-07-21 14:05:15 +08:00
yuanke 92ffbcfce6 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-21 14:03:16 +08:00
yuanke 7cd505ea4b 博客详情动态加入二级回复的展开功能一级一级回复的更多功能。 2016-07-21 14:03:04 +08:00
txz 24ee25e095 课程列表点击管理课程图标，列表展开bug修复 2016-07-21 13:54:03 +08:00
Tim fe105c84ad 弹框定位改为fixed 2016-07-21 10:18:58 +08:00
Tim 541440135f css中引用图片路径修改 2016-07-21 10:11:02 +08:00
Tim dcb541e889 资源库资源列表取消虚线 2016-07-20 17:10:51 +08:00
Tim 2850fe1b2b 预览图片边框阴影效果 2016-07-20 17:08:31 +08:00
Tim 85c9fb5dce 二级回复图片超出显示 2016-07-20 17:00:54 +08:00
Tim bf87ffb992 组织历史版本弹框文件夹图标问题 2016-07-20 16:21:58 +08:00
Tim 78e4d37d8b 大纲base页引入弹框样式；作业列表调整 2016-07-20 15:09:01 +08:00
yuanke ff42de619b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-20 14:06:16 +08:00
txz c56f7732a1 二级回复新样式 2016-07-20 14:05:17 +08:00
yuanke 67e87df4d5 微信动态详情回复显示修改 2016-07-20 13:34:58 +08:00
yuanke bf600e8f76 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-20 10:09:37 +08:00
yuanke 1ce7b22c0e 博客动态回复二级回复修改 2016-07-20 10:09:27 +08:00
txz 53feb0bbd4 课程列表课程名称宽度限制 2016-07-20 09:11:05 +08:00
txz 707df88c7f tab容器宽度百分百 2016-07-19 16:05:39 +08:00
txz 5b3c6cc012 输入框高度控制 2016-07-19 15:41:40 +08:00
txz 2af1a5ffb9 新增班级和管理班级输入框高度控制 2016-07-19 15:07:11 +08:00
txz 27965bee01 加入班级弹框样式统一 2016-07-19 11:17:46 +08:00
yuanke 80843d5084 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-19 10:50:46 +08:00
yuanke bc1b4c1b85 班级邀请码弹框修改，我的动态回复数计算修改 2016-07-19 10:50:36 +08:00
txz bc0d8cd299 管理班级重命名字体变灰 2016-07-19 10:25:45 +08:00
Tim 73401d6b41 下拉图标等显示 2016-07-19 09:09:13 +08:00
cxt fdf925a0b8 个人主页留言动态：如图回复当前用户自己的留言却不能删除，“展开回复”后又可删除了，刷新网页后又删除不了 2016-07-18 16:40:04 +08:00
Tim e966972750 Merge branch 'develop' into cs_optimize_txz 
Conflicts:
	app/views/versions/index.html.erb
 2016-07-18 14:32:17 +08:00
Tim 76555680e0 项目css统一 2016-07-18 14:30:01 +08:00
yuanke ff13d2e572 微信增加作业发送，修改发送的权限，修改菜单 2016-07-18 14:24:59 +08:00
yuanke f3d74fcd55 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-18 11:08:09 +08:00
yuanke 8968c991ff 微信：作业增加发送功能 2016-07-18 11:08:02 +08:00
guange 51692eadd6 改进上线流程 2016-07-17 00:49:35 +08:00
guange c14979d878 assets 2016-07-15 19:53:38 +08:00
yuanke 6ae57ef23a Merge branch 'weixin_guange' into develop 2016-07-15 19:53:33 +08:00
yuanke 67fa6da8ae 我的资源界面加载前 不显示暂无数据 2016-07-15 19:18:30 +08:00
yuanke 596bfe4bfc 邀请码分享问题修改 2016-07-15 19:08:05 +08:00
yuanke 7dd26bb5d9 邀请码BUG修改 2016-07-15 18:19:37 +08:00
guange 82aa369687 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 18:11:01 +08:00
guange c02245adfb 邀请码分享 2016-07-15 18:08:19 +08:00
txz b7477a73e4 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 17:31:36 +08:00
txz 6491e16c64 微信课程列表底边重合问题 2016-07-15 17:31:33 +08:00
huang f9e03434c2 Merge branch 'develop' into rep_quality 2016-07-15 16:51:31 +08:00
yuanke 6385cc892f Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 16:46:36 +08:00
yuanke 60dc0e72cf 微信我我的资源更多按钮显示 2016-07-15 16:46:27 +08:00
huang 2af3c50dbc 里程碑区分issue状态“已解决”“已关闭” 对应不同样式 2016-07-15 16:43:07 +08:00
yuanke 0a1ecd65e8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-07-15 16:31:42 +08:00
huang b2a8a0fed6 修复里程碑进度条数据显示错误的问题 2016-07-15 16:28:33 +08:00
txz 0d08d6b192 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 16:14:55 +08:00
txz 6063932840 课程管理中，对课程,班级名称编辑时，字体变灰 2016-07-15 16:14:52 +08:00
yuanke 9b17724ebf Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 16:08:42 +08:00
yuanke c476dae15b 微信我的资源中 更多按钮暂时隐藏 2016-07-15 16:08:04 +08:00
guange a177c48a29 erge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 16:00:19 +08:00
yuanke 2cc42a8f5a 微信修改资源更多问题 2016-07-15 15:32:40 +08:00
guange fff6f4b310 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 14:50:21 +08:00
guange dd892993dd assets 2016-07-15 14:49:23 +08:00
cxt b7e6725e1f 管理员界面的课程名称双击可点击 2016-07-15 14:48:39 +08:00
guange 0e415fffff merge 2016-07-15 14:48:10 +08:00
yuanke ae0a4f8ce4 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 14:44:48 +08:00
yuanke b540ff7017 我的资源里增加更多按钮 2016-07-15 14:44:37 +08:00
txz 5a463721b8 资源来源限制宽度 2016-07-15 14:09:22 +08:00
txz 08c6c16cfd 课程，项目详情页面属性字体减小 2016-07-15 10:56:54 +08:00
txz 54887112e4 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 10:52:46 +08:00
txz df8b995d41 作业，项目属性字体减小 2016-07-15 10:52:43 +08:00
yuanke dc2ba96353 用户注册发送绑定成功消息通知，加入班级消息通知点击跳入班级 2016-07-15 10:26:37 +08:00
cxt 7ea5d7d934 新建班级页面，提示“如果列表中没有对应的课程，请您先创建课程”始终显示 2016-07-15 10:21:59 +08:00
yuanke 16e029d340 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-14 17:39:31 +08:00
yuanke 4c39dcc677 微信：修改班级下有挂起作业所有作业都不显示的BUG，将班级下作业、测验发送按钮屏蔽 2016-07-14 17:39:22 +08:00
txz 433f12f184 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-14 17:34:31 +08:00
txz a43da43072 checked.png替换 2016-07-14 17:34:26 +08:00
yuanke d50fd40307 Merge branch 'weixin_guange' into develop 2016-07-14 17:19:47 +08:00
Tim c41a116378 博客上传附件后，编辑处文件夹图标显示；大纲引用css样式更改 2016-07-14 17:00:38 +08:00
yuanke 9c560e56b6 微信修改 不能直接给数据库对象增加新属性 2016-07-14 16:54:43 +08:00
Tim 1fdd1a2a21 作业列表css与develop分支同步；popup.css优化 2016-07-14 15:28:01 +08:00
cxt e19efc1c8a 博客的二级回复 2016-07-14 14:44:47 +08:00
Tim fdf147326c Merge branch 'develop' into cs_optimize_txz 2016-07-14 11:01:12 +08:00
Tim 2b5e31cab9 样式与develop分支同步 2016-07-14 11:00:03 +08:00
yuanke af2b306953 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-14 09:52:10 +08:00
yuanke 3c426c8d15 微信中英文逗号修改 2016-07-14 09:52:02 +08:00
txz 24821ba01d 登录与注册页面，输入文字显示不全bug 2016-07-14 09:44:35 +08:00
Tim 538303f4d1 导航头像处理 2016-07-14 09:11:38 +08:00
txz e61aa9e0dc 回复框高度自动增减js同步 2016-07-13 16:53:17 +08:00
yuanke a5acc2641e 微信点赞保证各个切换之间点赞状态保持一致 2016-07-13 14:06:56 +08:00
txz f83d791de1 进入课程后，课件，作业，测验及学生管理tab样式更改 2016-07-13 09:54:37 +08:00
txz 2cc87f1dd8 课程页面各tab显示bug 2016-07-12 17:33:55 +08:00
yuanke 2844ac2e65 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-12 15:52:08 +08:00
yuanke d75e2b740f 微信点击我的课程里面的两个按钮时没绑定会提示绑定 2016-07-12 15:51:58 +08:00
txz 78a6785b6b 微信回复框自动增高 2016-07-12 15:18:51 +08:00
txz 77f5ad09d2 各详情页面回复内容全部显示 2016-07-12 15:00:49 +08:00
txz 717bbe2ffa 回复框多行提交后初始化 2016-07-12 14:33:52 +08:00
txz 4434eb3620 回复框固定在最下显示 2016-07-12 14:10:30 +08:00
txz 9d91e9397b 微信邀请码提示文字修改 2016-07-12 11:01:01 +08:00
txz f33feb7d84 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-12 10:43:26 +08:00
txz 243f0bbe7d 微信详情内容与回复中链接添加蓝色 2016-07-12 10:43:21 +08:00
yuanke 4111ae632c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-12 10:25:28 +08:00
yuanke d4681eea00 我的资源里面显示来源 和大小 并可以下载课件 2016-07-12 10:25:18 +08:00
txz e3fe95213f 增加二级回复与文字间距离 2016-07-12 09:34:06 +08:00
yuanke 14b7b04e4d Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-11 16:55:56 +08:00
txz dc6127eb78 微信我的资源样式更改 2016-07-11 16:54:58 +08:00
yuanke 70ed5790b8 修改在动态详情点赞返回和点赞状态不一致的BUG 2016-07-11 16:46:07 +08:00
cxt b4e6561e50 Merge branch 'cxt_course' into develop 2016-07-11 15:16:27 +08:00
cxt 5d9bde3c95 课程发送资源到课程 2016-07-11 15:10:55 +08:00
txz cf304c2b68 dot.png图片更新 2016-07-11 15:10:52 +08:00
yuanke 627135ec12 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-11 14:50:10 +08:00
yuanke 374aa9918c 我的资源里面都显示未发布的，新建课程后返回会刷新数据 2016-07-11 14:49:59 +08:00
txz bd29859a28 创建课程和参与课程区分样式 2016-07-11 14:46:35 +08:00
txz 0093a0a509 微信邀请提示文字更改 2016-07-11 14:23:53 +08:00
Tim a0db221ffc Merge branch 'develop' into cs_optimize_txz 2016-07-11 13:57:04 +08:00
Tim 1aee5b6955 将大纲中共用样式提出；个性签名resize：none 2016-07-11 13:56:03 +08:00
huang 1283690250 Merge branch 'rep_quality' into develop 2016-07-11 11:34:07 +08:00
huang 93e79d9419 add hidden to css 2016-07-11 11:23:59 +08:00
txz 114512d3d9 资源宽度限制 2016-07-11 11:05:49 +08:00
txz 2e75fa4b23 课程动态中新建课程改为新建班级 2016-07-11 10:42:07 +08:00
txz 6ea1a605c9 flex布局兼容css更新 2016-07-11 10:37:56 +08:00
cxt 8e8d6a8439 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-11 08:48:03 +08:00
guange 135b6ca64b assets 2016-07-08 20:04:24 +08:00
guange 7c98e0f392 merge 2016-07-08 20:00:49 +08:00
guange 2b17828844 rge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-08 19:59:16 +08:00
guange 2604f3f0c7 资源搜索中只匹配name 2016-07-08 19:59:10 +08:00
yuanke f8eb150530 新增班级不完成点返回班级会出现再课程列表的BUG 2016-07-08 19:12:26 +08:00
guange 1413fe82dc merge 2016-07-08 17:44:13 +08:00
yuanke c2166811eb 修改管理课程界面刷新显示问题 2016-07-08 17:35:14 +08:00
yuanke 8d8de084ac Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-08 17:23:44 +08:00
yuanke c6099177a4 修改微信发送资源平台不显示发送人的问题，删除班级提示文字不居中的问题等 2016-07-08 17:22:58 +08:00
txz ea5bd94e99 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-08 17:22:50 +08:00
txz 9ae7461501 资源列表学生进入时也显示为课件；课程tab页样式替换 2016-07-08 17:22:44 +08:00
guange 3c36e97ff1 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-08 17:11:41 +08:00
guange 3c23560d77 我的资源搜索无效 2016-07-08 17:11:16 +08:00
guange 068c8967e1 新增班级时名称为1个字符时报错 2016-07-08 17:04:17 +08:00
Tim 03bb862e18 代码查重页面消息弹框显示样式丢失 2016-07-08 16:55:48 +08:00
yuanke 3a2e2c1174 未命名课程暂不允许进行课程管理 2016-07-08 16:40:24 +08:00
yuanke d38ce793bd Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-08 16:23:29 +08:00
yuanke bb62ba40b7 修改微信权限问题、管理课程界面等 2016-07-08 16:23:07 +08:00
Tim fec1015604 在线测验结果列表超出bug修改 2016-07-08 15:44:14 +08:00
cxt cc4b24cdb9 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-08 13:18:46 +08:00
cxt 13bae8f8a5 线下作业 2016-07-08 13:17:14 +08:00
huang ef8b127225 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
	public/javascripts/application.js
 2016-07-08 11:33:51 +08:00
huang e588321ada Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-08 11:31:02 +08:00
huang 61e2e427fd Merge branch 'rep_quality' into develop 2016-07-08 11:30:53 +08:00
txz ed39b4b4f1 动态：创建班级；学生进入资源也显示课件；已有班级和新增班级颜色区分 2016-07-08 11:29:33 +08:00
yuanke 06f7594680 Merge branch 'yuanke' into develop 2016-07-08 09:15:55 +08:00
Tim d7fb0d4bca 添加关注，取消关注图标更新 2016-07-08 09:10:03 +08:00
Tim fbedaea768 图标显示css修改 2016-07-08 09:00:54 +08:00
Tim 65cbf14d72 提交与取消按钮间添加间距；图标不显示等 2016-07-07 17:06:31 +08:00
cxt 3b418bc44c 如果未登陆，在资源列表最上面增加一个提示句（必须全局统一：您尚未登录，登录后可浏览更多信息），“登录”可做成链接。 2016-07-07 16:46:41 +08:00
cxt 37dd447fcb Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	app/views/admin/courses.html.erb
	public/stylesheets/new_user.css
 2016-07-07 15:14:11 +08:00
Tim b02c1b5995 提交与取消按钮之间增加间距；新建问卷"选项D"文字折行；日历图标样式调整，问题跟踪日历前input宽度缩减； 2016-07-07 15:08:34 +08:00
cxt da7509f64c 课程大纲的优化 2016-07-07 15:04:57 +08:00
guange a2ba65956c . 2016-07-07 15:03:45 +08:00
yuanke 3a6470b1f3 删除班级时增加提示确定信息 2016-07-07 14:55:41 +08:00
guange 7859bf9c32 . 2016-07-07 14:51:54 +08:00
guange a17a6ed596 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-07 14:35:26 +08:00
guange 10789d2505 added alert2 2016-07-07 14:35:15 +08:00
huang 92b6171c36 sonar error puts 2016-07-07 11:08:29 +08:00
Tim 421dc636fe 作业列表样式更新 2016-07-07 10:47:12 +08:00
cxt a99b03ff76 管理员界面增加配置课程 2016-07-07 09:02:41 +08:00
yuanke 9d46040f7a 课程列表 + - 按钮增加效果，资源发送界面课程列表显示和课程列表界面保持一直 2016-07-06 17:08:22 +08:00
yuanke 6fe8d7ddf5 点击图片弹框右下角统一用“关闭” 2016-07-06 16:03:50 +08:00
Tim 0b764d0dfc RSide样式处理 2016-07-06 15:52:18 +08:00
Tim 75475b6058 个人主页，课程，项目样式更新 2016-07-06 15:43:48 +08:00
yuanke b994e786ab 我的动态中三类动态之间切换的效果 2016-07-06 11:06:32 +08:00
Tim d2d2222ea2 组织成员列表样式调整 2016-07-06 10:00:28 +08:00
Tim 4136aa9291 二级回复，上传附件后删除图标，文件图标显示， 2016-07-06 09:07:48 +08:00
Tim d9fc479607 消息弹框显示css调整 2016-07-05 16:51:55 +08:00
cxt c5840d75da Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-05 16:49:50 +08:00
Tim 253933c85a 消息通知图标显示 2016-07-05 16:46:52 +08:00