 cxt
|
ff974d6901
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/views/wechats/login.html.erb
|
2016-05-26 15:32:00 +08:00 |
|
cxt
|
4d5ee5a722
|
微信的欢迎图片及欢迎词的修改,测试版的配置
|
2016-05-26 15:27:31 +08:00 |
 guange
|
b48b1c97b3
|
weixin
|
2016-05-26 13:02:27 +08:00 |
|
guange
|
e4653426d2
|
将openid存到session
|
2016-05-26 12:59:15 +08:00 |
|
cxt
|
7b7f9cf8f2
|
删除wechat无用代码
|
2016-05-24 19:52:51 +08:00 |
 huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-05-19 16:01:07 +08:00 |
|
cxt
|
6517f23f03
|
首页不显示项目的创建动态
|
2016-05-19 15:26:23 +08:00 |
|
guange
|
8411a08ddb
|
修改错别字
|
2016-05-14 09:43:01 +08:00 |
|
cxt
|
49a7e2ce1d
|
关注和绑定登录后发送欢迎消息
|
2016-04-26 09:03:01 +08:00 |
|
guange
|
055ba00de5
|
绑定成功后关闭页面
|
2016-04-09 23:20:24 +08:00 |
|
guange
|
0731405828
|
重新再次进来的用户提示欢迎信息
|
2016-04-08 10:50:05 +08:00 |
|
guange
|
ff93e9f79b
|
修改返回为json
|
2016-04-02 07:56:12 +08:00 |
|
guange
|
1926f0ba53
|
修改openid路由
|
2016-04-02 07:49:36 +08:00 |
|
guange
|
a25fe6cef8
|
修改openid路由
|
2016-04-02 07:47:34 +08:00 |
|
guange
|
9c93b3f9a6
|
修改openid调用位置
|
2016-04-02 07:43:55 +08:00 |
 Tim
|
406bb7930c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
public/javascripts/wechat/wechat-dev.js
|
2016-03-28 14:47:11 +08:00 |
|
guange
|
60931dde6a
|
添加获取openid的功能
|
2016-03-26 15:52:14 +08:00 |
|
guange
|
fbe1b2dac2
|
Merge branch 'guange_dev' into weixin_guange
# Conflicts:
# Gemfile
# db/schema.rb
|
2016-03-21 18:17:39 +08:00 |
|
guange
|
3c513085d2
|
request变量
|
2016-03-07 21:43:18 +08:00 |
|
guange
|
79004e1328
|
修改绑定流程
|
2016-03-03 23:27:05 +08:00 |
|
guange
|
697906509b
|
修改菜单
|
2016-03-01 17:58:54 +08:00 |
|
guange
|
f53d9e19f7
|
修改菜单
|
2016-03-01 17:55:03 +08:00 |
|
guange
|
8e1624fafe
|
修改菜单
|
2016-03-01 17:33:48 +08:00 |
|
guange
|
1b171e414c
|
修改菜单
|
2016-03-01 17:31:44 +08:00 |
|
guange
|
b823413267
|
修改菜单
|
2016-03-01 17:16:48 +08:00 |
|
guange
|
c33b35383d
|
修改菜单
|
2016-03-01 17:13:06 +08:00 |
|
guange
|
d5e8945619
|
修改菜单
|
2016-03-01 17:06:40 +08:00 |
|
guange
|
509d4a3df7
|
绑定提交改为ajax
|
2016-03-01 16:56:37 +08:00 |
|
guange
|
a59f65a455
|
wechat
|
2016-03-01 16:13:37 +08:00 |
|
guange
|
e487b39d16
|
修改wechat配置
|
2016-03-01 15:46:05 +08:00 |
|
guange
|
e32fdf6bcb
|
修改wechat配置
|
2016-03-01 15:21:20 +08:00 |
|
guange
|
dce93c8313
|
修改wechat配置
|
2016-03-01 14:50:05 +08:00 |
|
guange
|
60b35a46ce
|
获取企业id
|
2016-03-01 14:05:18 +08:00 |
|
guange
|
35f9dc6e77
|
传request参数
|
2016-02-28 22:28:44 +08:00 |
|
guange
|
0ab579af98
|
订阅时发绑定信息
|
2016-02-28 22:22:10 +08:00 |
|
guange
|
769b044df5
|
动态内容调整
|
2016-01-20 23:39:47 +08:00 |
|
guange
|
745b8399d1
|
动态内容调整
|
2016-01-20 23:38:40 +08:00 |
|
guange
|
6075f44786
|
动态内容调整
|
2016-01-20 23:34:05 +08:00 |
|
guange
|
9d33dcf2f3
|
动态内容调整
|
2016-01-20 23:32:43 +08:00 |
|
guange
|
74b643584f
|
动态内容调整
|
2016-01-20 23:31:29 +08:00 |
|
guange
|
472c6acf2b
|
动态内容调整
|
2016-01-20 23:29:22 +08:00 |
|
guange
|
22a83bee0e
|
动态内容调整
|
2016-01-20 23:26:58 +08:00 |
|
guange
|
c439d62a64
|
动态内容调整
|
2016-01-20 23:20:44 +08:00 |
|
guange
|
4607d1a78d
|
动态内容调整
|
2016-01-20 23:18:21 +08:00 |
|
guange
|
6d732ff5ff
|
动态内容调整
|
2016-01-20 23:17:17 +08:00 |
|
guange
|
fce8d85380
|
动态内容调整
|
2016-01-20 23:15:22 +08:00 |
|
guange
|
f644aa1144
|
图片调整
|
2016-01-20 22:31:36 +08:00 |
|
guange
|
a72339fe2c
|
图片调整
|
2016-01-20 22:27:50 +08:00 |
|
guange
|
02cf9b56e1
|
图片调整
|
2016-01-20 22:25:14 +08:00 |
|
guange
|
27c2e9eddc
|
是否绑定修改
|
2016-01-20 22:05:19 +08:00 |