 yuanke
|
bf5672e014
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-14 15:33:46 +08:00 |
|
yuanke
|
a7ef293356
|
.
|
2016-08-14 15:33:24 +08:00 |
 Tim
|
e7065ec88c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-14 15:31:09 +08:00 |
|
Tim
|
2659b742fd
|
成员管理头像高度不一致；邀请内容格式调整
|
2016-08-14 15:30:57 +08:00 |
|
yuanke
|
7e40c2447f
|
修改用户帐号显示，
|
2016-08-14 15:25:46 +08:00 |
|
yuanke
|
f9ee56111f
|
.
|
2016-08-14 13:46: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
|
f50cfe159c
|
微信用户合并修改
|
2016-08-14 12:35:03 +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
|
3be75c8633
|
微信BUG修改
|
2016-08-14 11:18:23 +08:00 |
 guange
|
1d53af36cd
|
merge
|
2016-08-14 11:16:20 +08:00 |
|
guange
|
dc7ff8f90f
|
.
|
2016-08-14 11:15:37 +08:00 |
|
yuanke
|
6cea0bfb67
|
.
|
2016-08-14 10:56:38 +08:00 |
|
yuanke
|
91a64a67c5
|
微信注册和绑定判断BUG修改
|
2016-08-14 10:46:17 +08:00 |
|
yuanke
|
56da43221d
|
修改绑定登录的地址
|
2016-08-14 10:28:46 +08:00 |
|
yuanke
|
6472a1c71c
|
Merge branch 'develop' into weixin_guange
|
2016-08-14 09:57:29 +08:00 |
|
yuanke
|
9446760258
|
Merge branch 'weixin_guange' into develop
Conflicts:
db/schema.rb
|
2016-08-14 09:56: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 |
|
guange
|
8b89d1bc49
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-13 21:54:54 +08:00 |
|
guange
|
b6bec5f9a7
|
wechat的access_token被复盖了
|
2016-08-13 21:51:55 +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 |
 huang
|
1f4f03d8ed
|
修改项目列表中的资源链接
|
2016-08-13 17:31:09 +08:00 |
 cxt
|
a4a0ef139b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-13 17:04:16 +08:00 |
|
cxt
|
1374444ec1
|
左侧项目列表的展开
|
2016-08-13 17:04:09 +08:00 |
|
huang
|
3ce088002a
|
留言和已关闭流程修改
|
2016-08-13 16:53:56 +08:00 |
|
huang
|
896e301b33
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-13 16:43:14 +08:00 |
|
huang
|
966722b920
|
关闭和打开的时候显示root问题
|
2016-08-13 16:43:00 +08:00 |
|
Tim
|
f67336fbe5
|
课程信息单词折行
|
2016-08-13 16:27:29 +08:00 |
|
guange
|
817fdad21d
|
.
|
2016-08-13 16:24:37 +08:00 |
|
huang
|
d7faed7f6d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-13 15:39:06 +08:00 |
|
huang
|
10730f3fba
|
Merge branch 'rep_quality' into develop
|
2016-08-13 15:37:36 +08:00 |
|
cxt
|
35260f2f6d
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-08-13 15:36:48 +08:00 |
|
cxt
|
f4e965c9fb
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-13 15:35:10 +08:00 |
|
cxt
|
2759d562ac
|
首页项目列表
|
2016-08-13 15:35:03 +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 |
|
huang
|
0c6e1b2ccb
|
版本库样式修改，显示全时间
|
2016-08-13 14:42:51 +08:00 |
|
huang
|
9003040d6a
|
版本库获取动态API修改
|
2016-08-13 14:42:24 +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 |