 guange
|
bb30709fa1
|
window close
|
2016-05-27 22:54:57 +08:00 |
|
guange
|
63b9aaefe2
|
window close
|
2016-05-27 22:22:09 +08:00 |
|
guange
|
be94d445a9
|
window close
|
2016-05-27 22:19:49 +08:00 |
|
guange
|
4561bdfd0d
|
code=>params[:code]
|
2016-05-27 22:18:03 +08:00 |
|
guange
|
4137fe07f3
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-05-27 22:14:55 +08:00 |
|
guange
|
622d71c476
|
已绑定成功的，直接提示
|
2016-05-27 22:14:41 +08:00 |
 txz
|
29faa015ab
|
微信图标替换，增加空值回复赞文字
|
2016-05-27 14:01:16 +08:00 |
|
txz
|
9134e55606
|
动态纯文本模式，图标处理
|
2016-05-26 17:40:22 +08:00 |
|
txz
|
55b3751beb
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-05-26 17:21:15 +08:00 |
|
txz
|
e7039df875
|
微信点击跳转区域更改，内容字体大小颜色更改
|
2016-05-26 17:21:02 +08:00 |
 cxt
|
0cac1e99c7
|
微信动态的描述过滤掉html
|
2016-05-26 17:18:58 +08:00 |
|
txz
|
8fbe4d636c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-05-26 13:48:13 +08:00 |
|
txz
|
7bb94d9df4
|
详情页面将内容和框架同时显示
|
2016-05-26 13:47:23 +08:00 |
|
guange
|
b48b1c97b3
|
weixin
|
2016-05-26 13:02:27 +08:00 |
|
guange
|
d034474f90
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-05-26 12:59:33 +08:00 |
|
guange
|
e4653426d2
|
将openid存到session
|
2016-05-26 12:59:15 +08:00 |
|
txz
|
1c95e76209
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-05-26 10:55:18 +08:00 |
|
txz
|
c73ce61afe
|
微信动态可点击，icon图片替换
|
2016-05-26 10:55:00 +08:00 |
|
guange
|
a3d90df5ce
|
delete unuse file
|
2016-05-26 10:51:39 +08:00 |
|
guange
|
01428fad14
|
merge
|
2016-05-26 10:51:01 +08:00 |
|
cxt
|
09b831c189
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-25 14:57:59 +08:00 |
|
cxt
|
d9bd13c2fc
|
复制课程报500
|
2016-05-25 14:57:46 +08:00 |
|
txz
|
921b01e8e3
|
输入框支持文字内容滑动
|
2016-05-25 14:26:49 +08:00 |
|
txz
|
c4c0dd3c60
|
回复内容换行符未显示
|
2016-05-25 13:50:59 +08:00 |
 huang
|
72ae31b7f9
|
作业导出资源代码回复
|
2016-05-25 11:23:19 +08:00 |
|
huang
|
b6de2dbd2d
|
发布作业导入资源
|
2016-05-25 09:44:30 +08:00 |
|
huang
|
d75943efe5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-25 09:11:26 +08:00 |
|
huang
|
197f054c18
|
注释掉申请私有资源功能
|
2016-05-25 09:10:41 +08:00 |
|
cxt
|
b1a58ecfb8
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
|
2016-05-24 20:51:24 +08:00 |
|
huang
|
b38bd0c1e5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-24 20:13:42 +08:00 |
|
cxt
|
ed2f413949
|
代码还原
|
2016-05-24 20:04:06 +08:00 |
|
cxt
|
7b7f9cf8f2
|
删除wechat无用代码
|
2016-05-24 19:52:51 +08:00 |
|
cxt
|
4ec0d6812b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-24 18:11:18 +08:00 |
|
huang
|
a7a2be6a4b
|
作业导入资源问题
|
2016-05-24 16:01:02 +08:00 |
|
txz
|
29ceb7b8e9
|
微信图标清晰问题，回复点赞右对齐
|
2016-05-24 15:01:26 +08:00 |
|
huang
|
bc0e24d39e
|
资源引用代码注释
|
2016-05-24 10:28:17 +08:00 |
|
cxt
|
6af9e849d9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-24 09:51:45 +08:00 |
|
cxt
|
13676ec9c3
|
微信的链接修改
|
2016-05-24 09:51:27 +08:00 |
|
txz
|
2a0b35a1b3
|
微信回复框高度随文字增减
|
2016-05-24 09:38:49 +08:00 |
|
huang
|
b1c70db28a
|
上线暂时还原代码
|
2016-05-23 16:34:31 +08:00 |
|
cxt
|
e62a4cc646
|
绑定新的微信公众号
|
2016-05-23 16:29:38 +08:00 |
|
huang
|
96223b414d
|
Merge branch 'hjq_mail' into develop
|
2016-05-23 15:03:45 +08:00 |
|
huang
|
d70f42b413
|
发布课程通知消息异步发送（测试版）
|
2016-05-23 15:03:22 +08:00 |
|
huang
|
a60356091b
|
issue中添加类型tag
|
2016-05-23 11:02:21 +08:00 |
|
huang
|
e9c7ad9337
|
Merge branch 'develop' into hjq_beidou
|
2016-05-23 10:34:27 +08:00 |
|
txz
|
103af96ac2
|
替换加载中gif图
|
2016-05-23 10:26:17 +08:00 |
|
huang
|
eead7962cf
|
资源申请权限控制
|
2016-05-21 11:39:50 +08:00 |
|
huang
|
66709b16e5
|
Merge branch 'yuanke' into develop
|
2016-05-20 22:09:58 +08:00 |
|
huang
|
27d029271b
|
Merge branch 'cxt_course' into develop
|
2016-05-20 22:08:45 +08:00 |
|
huang
|
86ff725b8a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-20 22:08:32 +08:00 |