Commit Graph

211 Commits

Author SHA1 Message Date
cxt 3e340b6ef9 博客微信api 2016-05-13 15:01:36 +08:00
cxt 89749b853b 微信帖子api 2016-05-13 14:43:22 +08:00
cxt e420be8ee9 Merge branch 'weixin_guange' into develop
Conflicts:
	app/models/blog_comment.rb
2016-04-12 15:56:08 +08:00
cxt 1882cd8f4f 用户姓名不显示 2016-04-12 15:42:59 +08:00
guange 7c5d62b8a8 头像url不显示 2016-04-09 23:16:22 +08:00
cxt 930d95f8b5 私有动态不显示的问题 2016-04-09 13:29:26 +08:00
cxt d6daa906b6 回复 2016-04-08 16:58:27 +08:00
cxt fcddaf403c 删除博客为空的数据 2016-04-08 15:59:23 +08:00
guange c5b1ffb42f 错误信息打印到日志 2016-04-08 14:50:49 +08:00
guange a35511195a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 14:42:39 +08:00
guange abf4a80942 错误信息打印到日志 2016-04-08 14:42:23 +08:00
cxt 15ce3ba7e9 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 14:38:43 +08:00
cxt eee7b89388 项目动态 2016-04-08 14:38:35 +08:00
guange 5241dddca2 错误信息打印到日志 2016-04-08 14:38:23 +08:00
cxt 51a61a52d4 activity.rb 2016-04-08 14:12:17 +08:00
cxt ae981cfb07 项目问答区改成项目讨论区 2016-04-07 16:57:40 +08:00
cxt 523a623f1b 作业详情页面的点赞 2016-04-07 16:53:37 +08:00
cxt c404d26ac5 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-07 16:40:36 +08:00
cxt dc0bf4df30 传act_id、act_type到详情页面 2016-04-07 16:40:21 +08:00
txz 139a7931ee 点赞功能修改 2016-04-07 16:39:04 +08:00
cxt 60c8320f82 praise api的修改 2016-04-07 15:42:08 +08:00
cxt 2fe32fda61 点赞的js 2016-04-07 15:17:42 +08:00
cxt c8e769e05b 回复倒序排列 2016-04-07 15:09:17 +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
cxt 6c527a9a54 点赞的api 2016-04-06 11:40:05 +08:00
guange 58c1b27600 加入openid传参 2016-04-02 08:13:52 +08:00
guange a6a0681b78 openid参数 2016-04-02 08:08:03 +08:00
guange e1f1c6fbc0 openid参数 2016-04-02 08:05:49 +08:00
guange 7d4de36521 修改openid调用位置 2016-04-02 07:39:46 +08:00
cxt 9da89ef5e2 课程通知的回复 2016-04-02 00:37:24 +08:00
cxt 790b452a9b issue回复 2016-04-01 23:22:39 +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
cxt 7dccb0d963 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 21:32:56 +08:00
cxt 88c39512b9 journal的修改 2016-04-01 21:32:33 +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
cxt 66e80d034f issue只取回复 2016-04-01 18:46:00 +08:00
Yiang Gan 869810b3a0 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 18:23:21 +08:00
Yiang Gan af2bd66847 回复api 2016-04-01 18:23:12 +08:00
Yiang Gan 4088fb9cb4 课程作业详情页面 2016-04-01 14:58:41 +08:00
cxt e4db141604 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-03-31 20:48:25 +08:00
Yiang Gan 03abdbb68b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-03-31 20:46:54 +08:00
Yiang Gan 536394663a 微信消息模板 2016-03-31 20:46:36 +08:00
Yiang Gan 392c5708f2 作业详情页面 2016-03-31 20:43:06 +08:00
Yiang Gan 6c831b6811 解决冲突 2016-03-30 18:00:39 +08:00