 cxt
|
6eb518c465
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
app/views/at/show.json.erb
app/views/layouts/new_base_user.html.erb
|
2016-08-26 16:23:07 +08:00 |
|
cxt
|
b33136c59b
|
班级问答区改成讨论区
|
2016-08-25 15:59:09 +08:00 |
 yuanke
|
aa11f39b2d
|
Merge branch 'develop' into weixin_guange
Conflicts:
public/assets/wechat/class.html
public/javascripts/wechat/controllers/class.js
|
2016-08-25 11:24:27 +08:00 |
|
yuanke
|
4932b9fad8
|
班级留言不显示
|
2016-08-25 10:55:22 +08:00 |
|
yuanke
|
f35c3e8528
|
微信新闻、issue增加二级回复等
|
2016-08-25 09:45:23 +08:00 |
|
yuanke
|
c612104fab
|
微信增加发帖功能
|
2016-08-23 16:52:35 +08:00 |
|
yuanke
|
e473a18487
|
提交错分支 还原
|
2016-08-23 10:26:39 +08:00 |
|
yuanke
|
965d8930dc
|
班级增加动态
|
2016-08-23 10:23:46 +08:00 |
|
yuanke
|
7e40c2447f
|
修改用户帐号显示，
|
2016-08-14 15:25:46 +08:00 |
|
yuanke
|
2f8b459a6f
|
微信用户激活修改
|
2016-08-14 13:35:00 +08:00 |
|
yuanke
|
22e4e56029
|
微信自动激活修改
|
2016-08-14 13:24:07 +08:00 |
|
yuanke
|
e17683d3d5
|
自动激活微信帐号
|
2016-08-14 12:42:39 +08:00 |
|
yuanke
|
0fc6b84584
|
自动激活修改
|
2016-08-14 12:32:47 +08:00 |
|
yuanke
|
6eca6253db
|
微信注册自动激活
|
2016-08-14 12:29:10 +08:00 |
|
yuanke
|
94777a42c4
|
修改重新获取refresh_token
|
2016-08-14 12:16:30 +08:00 |
|
yuanke
|
962a62577b
|
测试测试
|
2016-08-14 12:13:04 +08:00 |
|
yuanke
|
ba0d32bd09
|
修改判断绑定代码
|
2016-08-14 11:59:26 +08:00 |
|
yuanke
|
9d867aa224
|
修改微信BUG
|
2016-08-14 11:50:31 +08:00 |
|
yuanke
|
91a64a67c5
|
微信注册和绑定判断BUG修改
|
2016-08-14 10:46:17 +08:00 |
|
yuanke
|
7c222373dc
|
修改获取用户关注公众号结果
|
2016-08-14 09:55:02 +08:00 |
|
yuanke
|
4eec1f5d4e
|
获取未关注修改
|
2016-08-14 09:50:43 +08:00 |
|
yuanke
|
8ab003d5ee
|
分享页提交回复未关注公众号会跳到二维码界面
|
2016-08-14 09:38:47 +08:00 |
 guange
|
ea85c0c608
|
.
|
2016-08-13 21:57:22 +08:00 |
|
yuanke
|
61680c6343
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-13 18:35:21 +08:00 |
|
yuanke
|
85b3df889c
|
修改微信获取课程大纲的代码
|
2016-08-13 18:35:11 +08:00 |
|
guange
|
c9d32ca69b
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-13 15:25:07 +08:00 |
|
guange
|
70d58ccf85
|
恢复授权页
|
2016-08-13 15:24:52 +08:00 |
|
yuanke
|
e06f09406c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-13 14:41:46 +08:00 |
|
guange
|
dde0fbb3c1
|
迁移用户
|
2016-08-13 14:39:15 +08:00 |
|
yuanke
|
3a83b40a64
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-13 14:04:05 +08:00 |
|
yuanke
|
a979bd3d54
|
微信修改绑定成功的模版消息内容
|
2016-08-13 14:03:53 +08:00 |
|
guange
|
fc74e714ee
|
.
|
2016-08-13 13:53:21 +08:00 |
|
guange
|
a761bfe3f8
|
.
|
2016-08-13 11:37:37 +08:00 |
|
guange
|
b9cf2527a4
|
merge
|
2016-08-13 11:11:24 +08:00 |
|
guange
|
3130296e69
|
修改微信个人信息获取实现
|
2016-08-13 11:09:48 +08:00 |
|
yuanke
|
852c7929b6
|
修改审批通知链接
|
2016-08-13 10:39:32 +08:00 |
|
yuanke
|
88e23dca80
|
微信回复自动注册及获取微信昵称修改
|
2016-08-12 18:19:21 +08:00 |
|
yuanke
|
3051b82ac2
|
调试
|
2016-08-12 18:03:58 +08:00 |
|
yuanke
|
697e857806
|
调试
|
2016-08-12 18:00:09 +08:00 |
|
yuanke
|
e21f7a34bd
|
调试
|
2016-08-12 17:46:44 +08:00 |
|
yuanke
|
1a835a25db
|
调试
|
2016-08-12 17:38:24 +08:00 |
|
yuanke
|
2ff83aff81
|
调试
|
2016-08-12 17:30:48 +08:00 |
|
yuanke
|
bd12ea169d
|
调试
|
2016-08-12 16:58:48 +08:00 |
|
yuanke
|
5b208202a0
|
调试
|
2016-08-12 15:38:17 +08:00 |
|
yuanke
|
ae437912d8
|
调试
|
2016-08-12 15:06:28 +08:00 |
|
yuanke
|
ae13435de6
|
调试
|
2016-08-12 14:47:54 +08:00 |
|
yuanke
|
9fcb43b949
|
调试
|
2016-08-12 14:29:19 +08:00 |
|
yuanke
|
1f8ea39765
|
调试
|
2016-08-12 14:25:45 +08:00 |
|
yuanke
|
e4194288ce
|
微信获取用户信息修改
|
2016-08-12 10:59:12 +08:00 |
|
yuanke
|
5c42cdb39c
|
分享内容时改为用户信息授权方式
|
2016-08-12 10:40:36 +08:00 |