 huang
|
8446fbe39a
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/services/wechat_service.rb
public/stylesheets/weui/weixin.css
|
2016-05-03 17:14:58 +08:00 |
 txz
|
de8b303b93
|
微信数据请求时显示加载中
|
2016-05-03 15:37:35 +08:00 |
|
txz
|
dcb150559e
|
angularjs路径修改
|
2016-04-22 16:37:01 +08:00 |
|
txz
|
0bab42256c
|
微信loading弹框改
|
2016-04-21 11:21:29 +08:00 |
|
txz
|
39c64c9198
|
解决冲突
|
2016-04-21 10:41:54 +08:00 |
|
txz
|
8e254ff722
|
微信loading弹框
|
2016-04-21 10:38:36 +08:00 |
|
txz
|
0b82bf50c2
|
微信内容中图片正常显示
|
2016-04-20 15:45:33 +08:00 |
|
txz
|
6957c24da5
|
微信最新动态页面调整
|
2016-04-20 10:08:03 +08:00 |
|
txz
|
d0331da0c2
|
微信最新动态样式调整
|
2016-04-19 16:26:05 +08:00 |
|
txz
|
73b89cdde5
|
微信边框，回复点赞样式更改
|
2016-04-18 11:19:13 +08:00 |
|
txz
|
38c182d76a
|
作业发布者真名为空时，显示昵称
|
2016-04-12 15:51:18 +08:00 |
|
txz
|
3665597153
|
详情页面排版调整
|
2016-04-12 14:56:17 +08:00 |
|
txz
|
f82ad97a68
|
详情页面回复框宽度问题
|
2016-04-11 15:11:01 +08:00 |
 cxt
|
930d95f8b5
|
私有动态不显示的问题
|
2016-04-09 13:29:26 +08:00 |
|
txz
|
0262e3b8ab
|
回复长单词显示问题
|
2016-04-08 18:46:46 +08:00 |
|
cxt
|
d6daa906b6
|
回复
|
2016-04-08 16:58:27 +08:00 |
|
txz
|
c88e924843
|
博客留言html内容转义
|
2016-04-08 15:31:43 +08:00 |
|
cxt
|
1cb1835a1a
|
动态
|
2016-04-08 14:51:26 +08:00 |
|
cxt
|
e007ee58ef
|
博客动态
|
2016-04-08 14:46:42 +08:00 |
|
txz
|
4ab96586de
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-08 10:10:19 +08:00 |
|
txz
|
f3738519e9
|
长单词折行问题
|
2016-04-08 10:10:08 +08:00 |
|
cxt
|
1503686ddb
|
无更多动态时不显示更多
|
2016-04-08 10:09:45 +08:00 |
|
txz
|
411a8be8b8
|
点击展开
|
2016-04-07 16:58:06 +08:00 |
|
txz
|
139a7931ee
|
点赞功能修改
|
2016-04-07 16:39:04 +08:00 |
|
txz
|
938bf48d08
|
点赞功能修改
|
2016-04-07 15:26:23 +08:00 |
|
cxt
|
2fe32fda61
|
点赞的js
|
2016-04-07 15:17:42 +08:00 |
|
txz
|
3008c0c44d
|
activities.html冲突解决
|
2016-04-07 14:16:51 +08:00 |
|
txz
|
0b1b08bd3d
|
点赞
|
2016-04-07 14:15:19 +08:00 |
 guange
|
80f47476cb
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
# Conflicts:
# public/javascripts/wechat/app.js
|
2016-04-07 13:58:23 +08:00 |
|
guange
|
99f39696d0
|
点击展开功能完成
|
2016-04-07 13:57:38 +08:00 |
|
cxt
|
a0e95976ac
|
详情页面的点赞
|
2016-04-07 11:21:59 +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 |
|
txz
|
ec47fb1949
|
项目缺陷详情页面修改
|
2016-04-06 19:29:00 +08:00 |
|
txz
|
a1ef398b9d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-06 16:24:41 +08:00 |
|
txz
|
422621759e
|
项目讨论区详情修改
|
2016-04-06 16:24:35 +08:00 |
|
cxt
|
20bb8c1e09
|
留言详情页面
|
2016-04-06 16:23:21 +08:00 |
|
cxt
|
7cc98db541
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-06 15:45:43 +08:00 |
|
cxt
|
2ede6e2b9d
|
博客详情页面
|
2016-04-06 15:43:37 +08:00 |
|
txz
|
a1a9dbd8a3
|
项目讨论区详情页面
|
2016-04-06 15:34:54 +08:00 |
|
txz
|
468f3ae63e
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-06 14:44:46 +08:00 |
|
txz
|
c9687a8764
|
课程通知详情页面
|
2016-04-06 14:44:35 +08:00 |
|
cxt
|
e46c963931
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-06 11:40:16 +08:00 |
|
cxt
|
6c527a9a54
|
点赞的api
|
2016-04-06 11:40:05 +08:00 |
|
txz
|
feb0014bf8
|
作业详情页面
|
2016-04-06 11:29:50 +08:00 |
|
txz
|
18cda892d9
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-06 09:43:31 +08:00 |
|
cxt
|
be30ac889b
|
冲突
|
2016-04-06 09:43:04 +08:00 |
|
txz
|
0d04f996c5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-06 09:40:53 +08:00 |
|
cxt
|
035b47d2b7
|
issue页面的调整
|
2016-04-06 09:38:46 +08:00 |
|
guange
|
afd779f292
|
使用cookies存储openid
|
2016-04-05 17:19:00 +08:00 |