Commit Graph

112 Commits

Author SHA1 Message Date
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
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
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
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
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
txz 29faa015ab 微信图标替换,增加空值回复赞文字 2016-05-27 14:01:16 +08:00
txz e7039df875 微信点击跳转区域更改,内容字体大小颜色更改 2016-05-26 17:21:02 +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
txz c4c0dd3c60 回复内容换行符未显示 2016-05-25 13:50:59 +08:00
cxt b1a58ecfb8 Merge branch 'weixin_guange' into develop
Conflicts:
	1234567
2016-05-24 20:51:24 +08:00
txz 29ceb7b8e9 微信图标清晰问题,回复点赞右对齐 2016-05-24 15:01:26 +08:00
txz 2a0b35a1b3 微信回复框高度随文字增减 2016-05-24 09:38:49 +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 1b3bc38f8e 拖代码改动 2016-05-19 13:44:03 +08:00
txz 8d338cff9e 微信锁定帖子关闭回复 2016-05-13 15:48:31 +08:00
txz a1afd0dc96 微信回复多次点击,仅第一次生效 2016-05-11 09:38:02 +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
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