 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 |
|
cxt
|
c9cd0a151c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-06 14:56:23 +08:00 |
|
cxt
|
8f7c6f49b7
|
api的修改
|
2016-04-06 14:56:09 +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 |
|
huang
|
378dfca006
|
组织图标只有管理员可以修改
|
2016-04-06 13:53:40 +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 |
|
huang
|
dd68969c8b
|
Merge branch 'develop' into hjq_beidou
|
2016-04-06 11:05:31 +08:00 |
|
huang
|
a6f6f63d6d
|
图片上传添加提示
|
2016-04-06 11:05:13 +08:00 |
|
huang
|
2162d7d4b8
|
组织banner上传功能
|
2016-04-06 10:40:38 +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
|
606599047d
|
详情页出错
|
2016-04-05 17:35:27 +08:00 |
|
guange
|
23ec67b2eb
|
详情页出错
|
2016-04-05 17:23:36 +08:00 |
|
guange
|
afd779f292
|
使用cookies存储openid
|
2016-04-05 17:19:00 +08:00 |
|
guange
|
80d5424ff3
|
详情页出错
|
2016-04-05 16:36:18 +08:00 |
|
guange
|
619b07b5c2
|
服务器上调试openid成功
|
2016-04-05 16:32:42 +08:00 |
|
txz
|
50c6b565e7
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-05 16:32:38 +08:00 |
|
txz
|
11651fc866
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-05 15:58:11 +08:00 |
|
guange
|
bb5a527f9e
|
配置新菜单
|
2016-04-05 15:57:19 +08:00 |
|
guange
|
ae08031440
|
开放跨域
|
2016-04-05 15:54:30 +08:00 |
|
txz
|
b2a892bd22
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-05 15:12:50 +08:00 |
|
guange
|
417484f3ad
|
加入调试标志
|
2016-04-05 15:12:05 +08:00 |
|
huang
|
b94c483d21
|
Merge branch 'develop_new' into develop
|
2016-04-05 11:26:16 +08:00 |
|
huang
|
c408185b40
|
Merge branch 'develop_new' of http://git.trustie.net/jacknudt/trustieforge into develop_new
Conflicts:
db/schema.rb
|
2016-04-05 11:25:25 +08:00 |
|
huang
|
a69cbf1e73
|
Merge branch 'develop' into develop_new
|
2016-04-05 11:24:42 +08:00 |