 yuanke
|
6472a1c71c
|
Merge branch 'develop' into weixin_guange
|
2016-08-14 09:57:29 +08:00 |
|
yuanke
|
9446760258
|
Merge branch 'weixin_guange' into develop
Conflicts:
db/schema.rb
|
2016-08-14 09:56:17 +08:00 |
|
yuanke
|
7c222373dc
|
修改获取用户关注公众号结果
|
2016-08-14 09:55:02 +08:00 |
|
yuanke
|
4eec1f5d4e
|
获取未关注修改
|
2016-08-14 09:50:43 +08:00 |
|
yuanke
|
8ab003d5ee
|
分享页提交回复未关注公众号会跳到二维码界面
|
2016-08-14 09:38:47 +08:00 |
 guange
|
ea85c0c608
|
.
|
2016-08-13 21:57:22 +08:00 |
|
guange
|
8b89d1bc49
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-13 21:54:54 +08:00 |
|
guange
|
b6bec5f9a7
|
wechat的access_token被复盖了
|
2016-08-13 21:51:55 +08:00 |
|
yuanke
|
61680c6343
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-13 18:35:21 +08:00 |
|
yuanke
|
85b3df889c
|
修改微信获取课程大纲的代码
|
2016-08-13 18:35:11 +08:00 |
 huang
|
1f4f03d8ed
|
修改项目列表中的资源链接
|
2016-08-13 17:31:09 +08:00 |
 cxt
|
a4a0ef139b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-13 17:04:16 +08:00 |
|
cxt
|
1374444ec1
|
左侧项目列表的展开
|
2016-08-13 17:04:09 +08:00 |
|
huang
|
3ce088002a
|
留言和已关闭流程修改
|
2016-08-13 16:53:56 +08:00 |
|
huang
|
896e301b33
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-13 16:43:14 +08:00 |
|
huang
|
966722b920
|
关闭和打开的时候显示root问题
|
2016-08-13 16:43:00 +08:00 |
 Tim
|
f67336fbe5
|
课程信息单词折行
|
2016-08-13 16:27:29 +08:00 |
|
guange
|
817fdad21d
|
.
|
2016-08-13 16:24:37 +08:00 |
|
huang
|
d7faed7f6d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-13 15:39:06 +08:00 |
|
huang
|
10730f3fba
|
Merge branch 'rep_quality' into develop
|
2016-08-13 15:37:36 +08:00 |
|
cxt
|
35260f2f6d
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-08-13 15:36:48 +08:00 |
|
cxt
|
f4e965c9fb
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-13 15:35:10 +08:00 |
|
cxt
|
2759d562ac
|
首页项目列表
|
2016-08-13 15:35:03 +08:00 |
|
guange
|
c9d32ca69b
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-13 15:25:07 +08:00 |
|
guange
|
70d58ccf85
|
恢复授权页
|
2016-08-13 15:24:52 +08:00 |
|
huang
|
0c6e1b2ccb
|
版本库样式修改，显示全时间
|
2016-08-13 14:42:51 +08:00 |
|
huang
|
9003040d6a
|
版本库获取动态API修改
|
2016-08-13 14:42:24 +08:00 |
|
yuanke
|
e06f09406c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-13 14:41:46 +08:00 |
|
guange
|
dde0fbb3c1
|
迁移用户
|
2016-08-13 14:39:15 +08:00 |
 daiao
|
4a9967674a
|
1. 强制编辑基本资料，在删除单位时给出消息通知
2. 单位名称申请提示一直显示
3. 申请单位的消息通知显示申请人头像，并连接到申请人主页
|
2016-08-13 14:29:33 +08:00 |
|
huang
|
93f8ac31f1
|
项目资源库新分页及ajax刷新
|
2016-08-13 14:17:50 +08:00 |
|
yuanke
|
3a83b40a64
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-13 14:04:05 +08:00 |
|
yuanke
|
a979bd3d54
|
微信修改绑定成功的模版消息内容
|
2016-08-13 14:03:53 +08:00 |
|
guange
|
7b28d2d183
|
.
|
2016-08-13 13:57:27 +08:00 |
|
guange
|
fc74e714ee
|
.
|
2016-08-13 13:53:21 +08:00 |
|
huang
|
00f032816c
|
版本库获取方式修改
|
2016-08-13 13:48:23 +08:00 |
|
guange
|
4a88fbe3db
|
.
|
2016-08-13 13:36:15 +08:00 |
|
guange
|
a761bfe3f8
|
.
|
2016-08-13 11:37:37 +08:00 |
|
huang
|
37df983009
|
项目列表
|
2016-08-13 11:13:11 +08:00 |
|
guange
|
b9cf2527a4
|
merge
|
2016-08-13 11:11:24 +08:00 |
|
guange
|
3130296e69
|
修改微信个人信息获取实现
|
2016-08-13 11:09:48 +08:00 |
|
yuanke
|
852c7929b6
|
修改审批通知链接
|
2016-08-13 10:39:32 +08:00 |
|
huang
|
1b19d227f9
|
项目列表样式及连接
|
2016-08-13 10:17:38 +08:00 |
|
Tim
|
083d5453d4
|
加入课程、项目弹框，在内容部分不能拖拽
|
2016-08-13 10:00:31 +08:00 |
|
yuanke
|
88e23dca80
|
微信回复自动注册及获取微信昵称修改
|
2016-08-12 18:19:21 +08:00 |
|
yuanke
|
3051b82ac2
|
调试
|
2016-08-12 18:03:58 +08:00 |
|
yuanke
|
697e857806
|
调试
|
2016-08-12 18:00:09 +08:00 |
|
yuanke
|
e21f7a34bd
|
调试
|
2016-08-12 17:46:44 +08:00 |
|
yuanke
|
1a835a25db
|
调试
|
2016-08-12 17:38:24 +08:00 |
|
yuanke
|
9b52c1504e
|
调试
|
2016-08-12 17:33:45 +08:00 |