 guange
|
4e50a9e289
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-08 10:45:10 +08:00 |
|
guange
|
aa9cb4e579
|
merge
|
2016-04-08 10:44:36 +08:00 |
 huang
|
549ee9daa2
|
上传非图片格式的不显示问题
|
2016-04-08 10:41:11 +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 |
|
huang
|
bed583b051
|
提示语
|
2016-04-08 10:01:54 +08:00 |
|
huang
|
320ed07b31
|
解决上传图片问题
|
2016-04-08 09:55:02 +08:00 |
|
huang
|
c83eefbbaa
|
Merge branch 'hjq_beidou' into develop
|
2016-04-07 17:08:01 +08:00 |
|
huang
|
3501d6f1d6
|
完成组织模块的开发
|
2016-04-07 17:05:22 +08:00 |
|
cxt
|
bb71d1c322
|
调试模式
|
2016-04-07 16:59:46 +08:00 |
|
txz
|
5e92d788ea
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-07 16:58:12 +08:00 |
|
txz
|
411a8be8b8
|
点击展开
|
2016-04-07 16:58:06 +08:00 |
|
cxt
|
ae981cfb07
|
项目问答区改成项目讨论区
|
2016-04-07 16:57:40 +08:00 |
|
cxt
|
523a623f1b
|
作业详情页面的点赞
|
2016-04-07 16:53:37 +08:00 |
|
cxt
|
c404d26ac5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-07 16:40:36 +08:00 |
|
cxt
|
dc0bf4df30
|
传act_id、act_type到详情页面
|
2016-04-07 16:40:21 +08:00 |
|
txz
|
139a7931ee
|
点赞功能修改
|
2016-04-07 16:39:04 +08:00 |
|
cxt
|
60c8320f82
|
praise api的修改
|
2016-04-07 15:42:08 +08:00 |
|
txz
|
938bf48d08
|
点赞功能修改
|
2016-04-07 15:26:23 +08:00 |
|
huang
|
8d40950491
|
项目讨论区锁定后不能回复
|
2016-04-07 15:20:25 +08:00 |
|
cxt
|
2fe32fda61
|
点赞的js
|
2016-04-07 15:17:42 +08:00 |
|
cxt
|
5987659145
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-07 15:09:56 +08:00 |
|
cxt
|
c8e769e05b
|
回复倒序排列
|
2016-04-07 15:09:17 +08:00 |
|
txz
|
eb996280a6
|
点赞功能
|
2016-04-07 15:07:37 +08:00 |
|
cxt
|
f1783c06a2
|
详情页面传参openid
|
2016-04-07 14:24:15 +08:00 |
|
txz
|
3008c0c44d
|
activities.html冲突解决
|
2016-04-07 14:16:51 +08:00 |
|
txz
|
0b1b08bd3d
|
点赞
|
2016-04-07 14:15:19 +08:00 |
|
huang
|
23a4a29c76
|
关联项目、课程中过滤掉私有课程、项目
|
2016-04-07 14:12:24 +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 |
|
txz
|
572d84b55d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-07 11:40:27 +08:00 |
|
txz
|
6d8ffabb39
|
代码优化
|
2016-04-07 11:40:20 +08:00 |
|
guange
|
8ac8e1c9e5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-07 11:23:15 +08:00 |
|
guange
|
79dcd48d8c
|
重构
|
2016-04-07 11:22:22 +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 |
|
huang
|
623114dc41
|
解决删除项目的私有资源显示在我的资源中的问题
|
2016-04-06 19:02:07 +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
|
6115e374bf
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-06 15:34:59 +08:00 |
|
txz
|
a1a9dbd8a3
|
项目讨论区详情页面
|
2016-04-06 15:34:54 +08:00 |
|
guange
|
42bd2dcfc5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
# Conflicts:
# public/javascripts/wechat/app.js
|
2016-04-06 15:23:48 +08:00 |
|
guange
|
3ee79a6889
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
# Conflicts:
# public/javascripts/wechat/app.js
|
2016-04-06 15:23:20 +08:00 |
|
guange
|
70c2c9cc9f
|
把activities列表存起来,防止返回时页面变空
|
2016-04-06 15:19:18 +08:00 |