 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 |
 cxt
|
6517f23f03
|
首页不显示项目的创建动态
|
2016-05-19 15:26:23 +08:00 |
 txz
|
e2f3ba8e7d
|
微信问题修改
|
2016-05-19 15:20:46 +08:00 |
|
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
|
d6daa906b6
|
回复
|
2016-04-08 16:58:27 +08:00 |
|
cxt
|
fcddaf403c
|
删除博客为空的数据
|
2016-04-08 15:59:23 +08:00 |
|
cxt
|
eee7b89388
|
项目动态
|
2016-04-08 14:38:35 +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
|
dc0bf4df30
|
传act_id、act_type到详情页面
|
2016-04-07 16:40:21 +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 |
|
cxt
|
9da89ef5e2
|
课程通知的回复
|
2016-04-02 00:37:24 +08:00 |
|
cxt
|
790b452a9b
|
issue回复
|
2016-04-01 23:22:39 +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 |
|
Yiang Gan
|
536394663a
|
微信消息模板
|
2016-03-31 20:46:36 +08:00 |
|
Yiang Gan
|
6c831b6811
|
解决冲突
|
2016-03-30 18:00:39 +08:00 |
|
Yiang Gan
|
313d415a15
|
详情api
|
2016-03-30 17:49:05 +08:00 |
|
Tim
|
77e11fe0fe
|
微信最新动态修改
|
2016-03-30 17:47:44 +08:00 |
|
Yiang Gan
|
9cebcfdd2d
|
动态api调整
|
2016-03-30 15:51:27 +08:00 |
|
cxt
|
c8142b3ee5
|
作业api
|
2016-03-30 14:02:35 +08:00 |
|
Yiang Gan
|
4de598873f
|
动态和作业的api
|
2016-03-30 10:32:45 +08:00 |
|
guange
|
fbe1b2dac2
|
Merge branch 'guange_dev' into weixin_guange
# Conflicts:
# Gemfile
# db/schema.rb
|
2016-03-21 18:17:39 +08:00 |
 lizanle
|
c8cb730397
|
首页动态优化
|
2015-07-24 10:56:19 +08:00 |
|
lizanle
|
8350d5f10b
|
首页动态优化
|
2015-07-24 09:37:53 +08:00 |
|
lizanle
|
1b1cce615d
|
回复通知api
活跃排名api
其他api的修改
|
2015-07-08 17:36:17 +08:00 |
|
lizanle
|
6d85dd7ca4
|
app的课程动态界面api修改
添加活跃学生查看，
获取作业的匿评率
|
2015-07-07 17:18:29 +08:00 |
|
lizanle
|
c5e298d24e
|
停止匿评 api
|
2015-07-04 15:53:01 +08:00 |
|
lizanle
|
5c648c9284
|
Attachment添加file_dir 属性
|
2015-07-03 15:32:57 +08:00 |
|
lizanle
|
fe55258349
|
获取匿评状态的解释 api
开启匿评 api
|
2015-07-03 12:22:33 +08:00 |
|
lizanle
|
662fc02a80
|
news author解析
|
2015-07-03 09:44:26 +08:00 |
|
lizanle
|
426d382ee5
|
学生作业模型
|
2015-07-02 17:32:36 +08:00 |
|
lizanle
|
9eab8b92ca
|
动态 api 隐藏 资源 讨论区
|
2015-07-02 17:31:30 +08:00 |