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

517 Commits

Author SHA1 Message Date
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
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
txz ed39b4b4f1 动态：创建班级；学生进入资源也显示课件；已有班级和新增班级颜色区分 2016-07-08 11:29:33 +08:00
yuanke 3a6470b1f3 删除班级时增加提示确定信息 2016-07-07 14:55:41 +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
yuanke 9d46040f7a 课程列表 + - 按钮增加效果，资源发送界面课程列表显示和课程列表界面保持一直 2016-07-06 17:08:22 +08:00
yuanke b994e786ab 我的动态中三类动态之间切换的效果 2016-07-06 11:06:32 +08:00
txz 7a9665bbee 微信详情页面样式调整 2016-07-05 11:18:58 +08:00
txz 8a59623a73 项目问题，项目讨论区，博客，留言详情页面样式更新 2016-07-05 10:15:32 +08:00
txz 64a1d197ee Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-04 17:06:47 +08:00
txz 3066a564bd 课程作业详情页面样式更新 2016-07-04 17:06:43 +08:00
guange 373e3d3422 merge 2016-07-04 17:06:26 +08:00
guange 48fb02a2d6 管理课程 2016-07-04 17:04:06 +08:00
yuanke 08f263128c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-04 16:53:10 +08:00
yuanke 9d0b5789d9 1.修改我的动态博客详情页面显示不了的BUG 2.资源界面切换是暂无XX先隐藏 3. 发送资源不选择班级的提示修改 2016-07-04 16:50:49 +08:00
txz 45b824938e 课程讨论区与课程通知详情页面样式更新 2016-07-04 16:41:41 +08:00
guange 60367415fa 新建课程功能完成 2016-07-04 16:19:05 +08:00
txz bd1aae07fd 微信动态页面样式更新 2016-07-04 14:43:51 +08:00
guange 3c295ba5a1 merge 2016-07-04 10:54:03 +08:00
guange b010ce2e61 发送课程完成 2016-07-02 23:46:45 +08:00
cxt bdaa9983e3 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 11:30:24 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00
guange c248249983 注册没有loading图问题 2016-06-29 21:11:21 +08:00
guange 0bb5c8b5fb 注册绑定问题 2016-06-29 21:09:49 +08:00
guange 047903ddff 重构课程地址 2016-06-28 10:57:58 +08:00
guange 1e6454efc0 加入我的资源 2016-06-27 17:24:06 +08:00
guange 5477c794ba Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-27 16:03:55 +08:00
guange 3b383dfa65 老师课程界面 2016-06-27 16:03:07 +08:00
yuanke 11d38fc3e3 Merge branch 'yuanke' into develop 2016-06-27 15:58:26 +08:00
yuanke a83400f233 粘贴图片 留言和回复框 保持一直截图都可以粘贴进去 2016-06-27 15:57:45 +08:00
guange c501af70ba . 2016-06-27 11:09:25 +08:00
guange 2c2e1892e5 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-24 16:53:58 +08:00
guange c39a982093 二维码 2016-06-24 16:51:40 +08:00
guange 485d0e3743 ticket处理 2016-06-24 14:59:50 +08:00
guange f9075e08ba merge 2016-06-24 13:35:26 +08:00
guange d348981721 加入邀请码 2016-06-24 13:29:36 +08:00
guange 52d4d36097 邀请码页面 2016-06-24 09:01:12 +08:00
guange 7700445c17 加入课程 2016-06-22 16:42:20 +08:00
cxt 2176ad1ede Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-21 11:18:37 +08:00
cxt dc70b40309 kindeditor中的a标签属性编辑 2016-06-21 11:04:35 +08:00
guange 5a8de44c43 添加我的班级控制器 2016-06-20 19:42:51 +08:00
yuanke fde06a2327 更新资源描述样式修改 2016-06-20 16:35:16 +08:00
guange 61c117b8cb 重构老的代码，本地通过session来存放token, 所有的访问直接用老接口 2016-06-20 14:39:20 +08:00
txz b17b92cc3e 微信回复后先加载后启用回复按钮 2016-06-20 11:08:57 +08:00
yuanke 7c729107cc KE复制粘贴的时候保留图片的外链 2016-06-20 09:40:21 +08:00
guange 98c6548e39 重写登录和注册 2016-06-17 18:18:03 +08:00
txz 18df93ba9f 微信动态列表界面问题 2016-06-17 16:16:24 +08:00
txz acf17d6252 微信详情页面链接添加颜色 2016-06-17 15:45:29 +08:00
guange ada15b4212 格式上的调整, 现在可以分开写,但发布时打成一个js提高性能 2016-06-14 16:03:10 +08:00
guange b1791f4531 wechat结构分离 2016-06-14 14:24:39 +08:00
txz 270399c5da 点赞时图标移动修复 2016-06-14 14:04:39 +08:00
txz a2450defc6 微信作业详情类别文字处理 2016-06-13 17:32:51 +08:00
txz 962470c582 微信文字显示不全bug 2016-06-13 17:23:35 +08:00
guange d3d31ca3a2 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-12 17:18:34 +08:00
guange d3c45fd133 使用jquery1.3比较小 2016-06-12 13:40:14 +08:00
guange 36fedd4d15 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-06-12 10:21:07 +08:00
guange 793b651393 压缩angularjs 2016-06-09 19:48:58 +08:00
txz 070b48d85f 增加作业类别 2016-06-08 15:48:24 +08:00
txz 981b199a0f 微信图标与数字间距调整，作业增加作业类型 2016-06-08 15:34:14 +08:00
txz 5f26e9e3ee 微信回复文字格式不一致，微信回复换行处理 2016-06-08 15:02:06 +08:00
yuanke e4312674c4 KE表格修改 2016-06-08 11:11:32 +08:00
yuanke ec39c16c66 Merge branch 'develop' into yuanke 2016-06-08 09:41:18 +08:00
txz 24a17d719e Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-06-08 09:15:41 +08:00
txz 9b4a3a704d 锁定帖子不能回复 2016-06-08 09:15:35 +08:00
yuanke 5999189f3a 1.视频根据http还是https分类显示。 
2.表格内容超出表格的改为换行。
3.有些浏览器缩进仍然显示方框。
 2016-06-08 09:02:00 +08:00
guange b965698fdf merge 2016-06-07 17:45:19 +08:00
guange 90ac57ed6a base 2016-06-07 16:46:10 +08:00
cxt 91f7e950ee 正式版微信 2016-06-06 12:22:52 +08:00
huang 4367cf2233 Merge branch 'yuanke' into develop 2016-06-03 15:01:37 +08:00
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
cxt cba5b246bc 微信动态的返回不刷新 2016-06-01 14:14:24 +08:00
guange c9eddad45d 更多修复 2016-05-31 21:09:47 +08:00
guange 32ffd2a5b5 返回优化完成 2016-05-31 20:55:46 +08:00
guange 48b36e5d16 优化返回刷新 2016-05-31 20:46:46 +08:00
guange 6e44e8355c Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-05-31 19:21:08 +08:00
guange 1bdf8800bd Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-05-31 19:20:45 +08:00
txz 91be3b9f85 回复提交时按钮变灰 2016-05-31 14:37:45 +08:00
txz f166a951f3 详情页面文字格式问题 2016-05-31 13:49:39 +08:00
cxt 79c106a1c6 微信动态的缺失 2016-05-31 11:04:20 +08:00
txz 19de82359a 微信进入详情页面显示加载中 2016-05-31 10:53: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
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
txz e7039df875 微信点击跳转区域更改，内容字体大小颜色更改 2016-05-26 17:21:02 +08:00
yuanke 9603115a86 KE编辑时链接的颜色改为和显示的时候一样并将下划线去掉 2016-05-26 14:02:17 +08:00
txz 7bb94d9df4 详情页面将内容和框架同时显示 2016-05-26 13:47:23 +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 01428fad14 merge 2016-05-26 10:51:01 +08:00
yuanke 192258a82d 1.取消KE编辑时候段落的上下边距 
2.先编号后段落 可以切换段落样式  正文还不能切换
 2016-05-25 17:04:46 +08:00
txz c4c0dd3c60 回复内容换行符未显示 2016-05-25 13:50:59 +08:00
yuanke 46860a838b 1.设置表格边框后所有的表格线宽度都一样 
2.KE改变字体后再点击字体会标明当前的字体
 2016-05-25 10:34:09 +08:00
cxt b1a58ecfb8 Merge branch 'weixin_guange' into develop 
Conflicts:
	1234567
 2016-05-24 20:51:24 +08:00
yuanke 9e8411aac9 修改ke：issue描述只有一行，点击编辑后，描述框被拉高了，有很多空白 2016-05-24 16:22:46 +08:00
txz 29ceb7b8e9 微信图标清晰问题，回复点赞右对齐 2016-05-24 15:01:26 +08:00
txz 2a0b35a1b3 微信回复框高度随文字增减 2016-05-24 09:38:49 +08:00
yuanke 6d7eca487f 将KE的newlineTag：'br' 改为'p',方便识别网址 2016-05-20 17:02:43 +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
txz e2f3ba8e7d 微信问题修改 2016-05-19 15:20:46 +08:00
txz 278ee66368 系统冲突 2016-05-19 13:47:08 +08:00
txz 1b3bc38f8e 拖代码改动 2016-05-19 13:44:03 +08:00
yuanke 52724bd9ed KE ol ul标签增加margin-bottom:0 2016-05-18 15:11:53 +08:00
yuanke 0e016eed2a KE上传非图片格式时弹框用新的,博客帖子发帖时间改为发布 2016-05-18 14:15:39 +08:00
yuanke 0ac7163b05 KE修改居中换行居中消失的问题 2016-05-17 15:55:24 +08:00
yuanke c0de43ecc0 修改KE字体间距问题，代码测试出错提示。 2016-05-17 10:31:10 +08:00
yuanke 708cb35fd2 增加一个弹框的通用接口pop_up_box 2016-05-16 16:57:18 +08:00
huang 0cc9a9e4c5 Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke 2016-05-13 20:02:32 +08:00
yuanke 6056505f96 复制粘贴时将图片所带链接删掉 2016-05-13 19:07:36 +08:00
yuanke 2c7a964470 复制粘贴图片相关 2016-05-13 16:59:59 +08:00
txz 8d338cff9e 微信锁定帖子关闭回复 2016-05-13 15:48:31 +08:00
huang 1cd74121ae Merge branch 'yuanke' into develop 2016-05-13 15:25:04 +08:00
yuanke a67ee38ac9 将复制粘贴的图片 链接及class都去掉 2016-05-13 15:18:48 +08:00
yuanke fc0f92738d 复制粘贴时将图片所带链接去掉 2016-05-13 14:58:35 +08:00
yuanke 80c6edd2d3 KE过滤html代码的时候表格的颜色等样式不能被过滤掉 2016-05-13 14:22:10 +08:00
huang 7759670fa1 Merge branch 'yuanke' into develop 
Conflicts:
	Gemfile
	public/stylesheets/new_user.css
 2016-05-13 11:39:01 +08:00
yuanke a1323e3d76 表格问题 2016-05-13 11:32:52 +08:00
yuanke a39702f962 图片自动上传，代码测试编译错误过长。 2016-05-13 08:38:28 +08:00
yuanke 135e02504e 图片自动上传 2016-05-11 11:40:01 +08:00
txz a1afd0dc96 微信回复多次点击，仅第一次生效 2016-05-11 09:38:02 +08:00
yuanke e502aa7c43 KE表格项目问题，自动上传图片做了一点 2016-05-10 12:51:42 +08:00
huang e8c458c163 Merge branch 'yuanke' into develop 2016-05-06 22:03:36 +08:00
yuanke 350e3f8eb4 表格颜色问题没改好暂时还原之前的 2016-05-06 21:34:08 +08:00
huang 572a051b04 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/users_controller.rb
	app/views/blogs/_article.html.erb
	app/views/layouts/new_base_user.html.erb
 2016-05-06 11:35:27 +08:00
yuanke 283a83013c KE 修改项目符号、表格颜色问题 2016-05-06 08:48:15 +08:00
huang 8446fbe39a Merge branch 'weixin_guange' into develop 
Conflicts:
	app/services/wechat_service.rb
	public/stylesheets/weui/weixin.css
 2016-05-03 17:14:58 +08:00
txz de8b303b93 微信数据请求时显示加载中 2016-05-03 15:37:35 +08:00
txz dcb150559e angularjs路径修改 2016-04-22 16:37:01 +08:00
txz 0bab42256c 微信loading弹框改 2016-04-21 11:21:29 +08:00
txz 39c64c9198 解决冲突 2016-04-21 10:41:54 +08:00
txz 8e254ff722 微信loading弹框 2016-04-21 10:38:36 +08:00
txz 0b82bf50c2 微信内容中图片正常显示 2016-04-20 15:45:33 +08:00
txz 6957c24da5 微信最新动态页面调整 2016-04-20 10:08:03 +08:00
txz d0331da0c2 微信最新动态样式调整 2016-04-19 16:26:05 +08:00
txz 73b89cdde5 微信边框，回复点赞样式更改 2016-04-18 11:19:13 +08:00
yuanke ef4b256313 Merge branch 'yuanke' into develop 
Conflicts:
	app/models/homework_common.rb
	config/locales/zh.yml
	db/schema.rb
 2016-04-14 11:32:35 +08:00
yuanke a8dce5e520 代码查重功能增加,管理员界面增加代码测试列表. 2016-04-14 11:29:22 +08:00
txz 38c182d76a 作业发布者真名为空时，显示昵称 2016-04-12 15:51:18 +08:00
txz 3665597153 详情页面排版调整 2016-04-12 14:56:17 +08:00
txz f82ad97a68 详情页面回复框宽度问题 2016-04-11 15:11:01 +08:00
cxt 930d95f8b5 私有动态不显示的问题 2016-04-09 13:29:26 +08:00
txz 0262e3b8ab 回复长单词显示问题 2016-04-08 18:46:46 +08:00
cxt d6daa906b6 回复 2016-04-08 16:58:27 +08:00
txz c88e924843 博客留言html内容转义 2016-04-08 15:31:43 +08:00
cxt 1cb1835a1a 动态 2016-04-08 14:51:26 +08:00
cxt e007ee58ef 博客动态 2016-04-08 14:46:42 +08:00
guange 4e50a9e289 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 10:45:10 +08:00
guange aa9cb4e579 merge 2016-04-08 10:44:36 +08:00
txz 4ab96586de Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 10:10:19 +08:00
txz f3738519e9 长单词折行问题 2016-04-08 10:10:08 +08:00
cxt 1503686ddb 无更多动态时不显示更多 2016-04-08 10:09:45 +08:00
txz 411a8be8b8 点击展开 2016-04-07 16:58:06 +08:00
txz 139a7931ee 点赞功能修改 2016-04-07 16:39:04 +08:00
txz 938bf48d08 点赞功能修改 2016-04-07 15:26:23 +08:00
cxt 2fe32fda61 点赞的js 2016-04-07 15:17:42 +08:00
txz 3008c0c44d activities.html冲突解决 2016-04-07 14:16:51 +08:00
txz 0b1b08bd3d 点赞 2016-04-07 14:15:19 +08:00
guange 80f47476cb Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
# Conflicts:
#	public/javascripts/wechat/app.js
 2016-04-07 13:58:23 +08:00
guange 99f39696d0 点击展开功能完成 2016-04-07 13:57:38 +08:00
cxt a0e95976ac 详情页面的点赞 2016-04-07 11:21:59 +08:00
cxt edb18bd1b8 api提供has_praise 2016-04-07 11:16:38 +08:00
txz 8e1473a484 点赞代码优化等 2016-04-07 09:26:24 +08:00
txz ec47fb1949 项目缺陷详情页面修改 2016-04-06 19:29:00 +08:00
txz a1ef398b9d Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-06 16:24:41 +08:00
txz 422621759e 项目讨论区详情修改 2016-04-06 16:24:35 +08:00
cxt 20bb8c1e09 留言详情页面 2016-04-06 16:23:21 +08:00
cxt 7cc98db541 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-06 15:45:43 +08:00
cxt 2ede6e2b9d 博客详情页面 2016-04-06 15:43:37 +08:00
txz a1a9dbd8a3 项目讨论区详情页面 2016-04-06 15:34:54 +08:00
txz 468f3ae63e Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-06 14:44:46 +08:00
txz c9687a8764 课程通知详情页面 2016-04-06 14:44:35 +08:00
cxt e46c963931 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-06 11:40:16 +08:00
cxt 6c527a9a54 点赞的api 2016-04-06 11:40:05 +08:00
txz feb0014bf8 作业详情页面 2016-04-06 11:29:50 +08:00
txz 18cda892d9 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-06 09:43:31 +08:00
cxt be30ac889b 冲突 2016-04-06 09:43:04 +08:00
txz 0d04f996c5 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-06 09:40:53 +08:00
cxt 035b47d2b7 issue页面的调整 2016-04-06 09:38:46 +08:00
guange afd779f292 使用cookies存储openid 2016-04-05 17:19:00 +08:00
txz 48e26fce62 冲突解决 2016-04-05 10:43:51 +08:00
txz 8c7de04dbf 项目问答详情页面 2016-04-05 10:30:25 +08:00
guange 36f3e3a46c 改为angularjs实现 2016-04-04 22:24:13 +08:00
guange 7d4de36521 修改openid调用位置 2016-04-02 07:39:46 +08:00
guange 5839959f0a 修改openid调用位置 2016-04-02 07:32:40 +08:00
cxt 9da89ef5e2 课程通知的回复 2016-04-02 00:37:24 +08:00
cxt d47f887fd1 issue回复的修改 2016-04-01 23:48:29 +08:00
cxt bc5e455f0f 解决冲突 2016-04-01 23:25:19 +08:00
cxt 790b452a9b issue回复 2016-04-01 23:22:39 +08:00
txz d45604c4a0 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 23:21:25 +08:00
txz 3b70970651 问题跟踪详情页面修改 2016-04-01 23:21:18 +08:00
cxt cc2fe6108a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 22:38:57 +08:00
cxt 5e697e5367 作业的回复 2016-04-01 22:38:45 +08:00
txz 0d24de7198 详情页面回复 2016-04-01 22:35:44 +08:00
txz 58e5fe85c3 issue 详情页面 2016-04-01 21:28:25 +08:00
txz 4902361b3f 冲突解决 2016-04-01 20:56:50 +08:00
txz 596bf641ac 最新动态各详情页面 2016-04-01 20:53:21 +08:00
cxt b3b0488bf5 动态点击更多 2016-04-01 20:46:38 +08:00
Yiang Gan 4088fb9cb4 课程作业详情页面 2016-04-01 14:58:41 +08:00
Yiang Gan 392c5708f2 作业详情页面 2016-03-31 20:43:06 +08:00
Yiang Gan 6dc374cf9a 最新动态 2016-03-30 17:41:18 +08:00
Yiang Gan 4de598873f 动态和作业的api 2016-03-30 10:32:45 +08:00
Tim 406bb7930c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	public/javascripts/wechat/wechat-dev.js
 2016-03-28 14:47:11 +08:00
Tim a9fd79ec63 微信动态筛选 2016-03-28 14:45:11 +08:00
guange d5124e128e 添加调试功能 2016-03-26 15:56:36 +08:00
guange 60931dde6a 添加获取openid的功能 2016-03-26 15:52:14 +08:00
Tim 4f7d698076 wechat init 2016-03-26 14:45:57 +08:00
yuanke a10830c90f Merge branch 'develop' into yuanke 
Conflicts:
	public/stylesheets/new_user.css
 2016-03-21 14:40:47 +08:00
luoquan 901409ebb4 Merge branch 'yuanke' into luoquan 
Conflicts:
	public/assets/kindeditor/kindeditor.js
 2016-03-11 14:40:07 +08:00
luoquan 1900a824e8 0 2016-03-11 14:39:17 +08:00
luoquan 033c7991e1 修改媒体播放 2016-03-11 13:16:44 +08:00
luoquan a418c0937d Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan 
Conflicts:
	public/assets/kindeditor/kindeditor.js
	public/assets/kindeditor/plugins/code/previewcode.css
 2016-03-11 10:21:59 +08:00
luoquan 62f91865e0 kindeditor视频添加默认图片 2016-03-11 10:21:16 +08:00
luoquan e80caf87b2 还原行距问题 2016-03-11 09:52:36 +08:00
luoquan 2d14b26c11 还原行距问题 2016-03-11 09:52:11 +08:00
yuanke 28b481cf36 修改KE点击上传图片时选择非图片格式时的提示信息 2016-03-10 15:37:07 +08:00
yuanke 9b5cd8f880 KE表格修改 2016-03-10 11:28:56 +08:00
yuanke 5ea618b520 修改KE插入图片没显示完全的问题 2016-03-10 11:16:39 +08:00
luoquan a6da304b56 修改KE编辑换行后发布对不齐问题 2016-03-10 11:10:05 +08:00
yuanke e073d58169 KE的几个问题修改 
1.我要回复
2.段落颜色
3.变粗滚动条移动
4.没默认字体
 2016-03-09 10:16:27 +08:00
Tim 8feea07825 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-01-14 15:59:50 +08:00
guange d935532f8d 课程讨论区at功能 2016-01-13 17:50:08 +08:00
guange 8ea9430318 at链接问题修改 2016-01-04 15:51:24 +08:00
guange 8cdd7c58cf at名单加宽一点 2015-12-21 15:14:51 +08:00
guange 5748078e3e 只调用一次at列表 2015-12-18 20:40:52 +08:00
guange 488e62472d at改为点击时加载. 2015-12-18 20:26:50 +08:00
guange 9dea58c921 将contentEditable改为enable_at 2015-12-18 17:41:14 +08:00
guange 634815f93a at后字体改 2015-12-18 16:50:59 +08:00
guange 71a0802a49 at后字体改色 2015-12-18 16:46:35 +08:00
guange eb97f7dfb2 merge 2015-12-18 09:20:51 +08:00
guange ed649e0724 @颜色修改 2015-12-17 15:54:29 +08:00
lizanle 1809a93770 editor修改 2015-12-17 15:41:36 +08:00
lizanle 68aceaa7df issue下载 2015-12-15 18:43:58 +08:00
guange 4ce9eb428e at样式问题 2015-12-15 16:28:11 +08:00
guange da5709e3f0 . 2015-12-15 14:52:24 +08:00
guange 4f57e48b92 merge 2015-12-14 18:20:32 +08:00
guange d1315e35b5 merge 2015-12-14 17:26:40 +08:00
guange f61f639af2 转换为remote js 2015-12-14 17:13:57 +08:00
ouyangxuhua 1a7a97dbc5 引用了ke的页面下方存在一个可见的uploadbutton 2015-12-09 15:53:36 +08:00
guange 3476731b83 将at js data整合到文件中 2015-12-09 09:59:13 +08:00
guange 71a5504017 去除at功能,合并 2015-12-07 15:05:51 +08:00
guange 1a2aff99be 调整显示的格式 2015-12-07 14:18:01 +08:00
guange 7e5a7fce29 加入atwho 2015-12-06 15:04:07 +08:00