Commit Graph

15960 Commits

Author SHA1 Message Date
huang 7493de1334 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-24 17:38:40 +08:00
huang 0cc59260cd modified sonar list form of language 2016-08-24 17:35:04 +08:00
huang 8cc60ef1e8 delete some language of quality_analysis 2016-08-24 17:28:55 +08:00
huang ba6d0e6926 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-24 15:13:00 +08:00
huang bafb3e98a7 tip for sonar results 2016-08-24 15:05:10 +08:00
huang ea6b928188 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-22 17:19:48 +08:00
huang 5e98884801 tip for sonar 2016-08-22 16:32:32 +08:00
huang af079a1cc3 Merge branch 'develop' into rep_quality 2016-08-22 14:37:51 +08:00
huang f8fc656920 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-22 14:22:31 +08:00
huang 300dab5fa1 版本库更新时间提交 2016-08-22 14:20:59 +08:00
yuanke 96ce09ede3 Merge branch 'weixin_guange' into develop 2016-08-14 16:32:28 +08:00
yuanke eaf6706e34 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-14 16:21:03 +08:00
yuanke 8a94d205f4 . 2016-08-14 16:20:53 +08:00
Tim e12f77cfa5 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-14 16:06:46 +08:00
Tim 19becbfdf3 邀请内容更改 2016-08-14 16:06:37 +08:00
yuanke bf5672e014 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-14 15:33:46 +08:00
yuanke a7ef293356 . 2016-08-14 15:33:24 +08:00
Tim e7065ec88c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-14 15:31:09 +08:00
Tim 2659b742fd 成员管理头像高度不一致;邀请内容格式调整 2016-08-14 15:30:57 +08:00
yuanke 7e40c2447f 修改用户帐号显示, 2016-08-14 15:25:46 +08:00
yuanke 38a58cd3fc Merge branch 'weixin_guange' into develop 2016-08-14 13:47:22 +08:00
yuanke f9ee56111f . 2016-08-14 13:46:46 +08:00
yuanke 2f8b459a6f 微信用户激活修改 2016-08-14 13:35:00 +08:00
yuanke 22e4e56029 微信自动激活修改 2016-08-14 13:24:07 +08:00
yuanke e17683d3d5 自动激活微信帐号 2016-08-14 12:42:39 +08:00
yuanke f50cfe159c 微信用户合并修改 2016-08-14 12:35:03 +08:00
yuanke 0fc6b84584 自动激活修改 2016-08-14 12:32:47 +08:00
yuanke 6eca6253db 微信注册自动激活 2016-08-14 12:29:10 +08:00
yuanke 94777a42c4 修改重新获取refresh_token 2016-08-14 12:16:30 +08:00
yuanke 962a62577b 测试测试 2016-08-14 12:13:04 +08:00
yuanke c16ea6d8be Merge branch 'weixin_guange' into develop 2016-08-14 12:06:52 +08:00
yuanke ba0d32bd09 修改判断绑定代码 2016-08-14 11:59:26 +08:00
yuanke 9d867aa224 修改微信BUG 2016-08-14 11:50:31 +08:00
huang ea3ba1f71e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-14 11:30:54 +08:00
huang 36e1217f49 Merge branch 'rep_quality' into develop 2016-08-14 11:30:45 +08:00
huang 577aa40ea1 time for nil 2016-08-14 11:27:49 +08:00
yuanke 68b0ac39ee Merge branch 'weixin_guange' into develop 2016-08-14 11:25:30 +08:00
yuanke 3be75c8633 微信BUG修改 2016-08-14 11:18:23 +08:00
huang d7177713ff 勾选游客后,游客能够下载资源 2016-08-14 11:16:43 +08:00
guange 1d53af36cd merge 2016-08-14 11:16:20 +08:00
guange dc7ff8f90f . 2016-08-14 11:15:37 +08:00
yuanke 6cea0bfb67 . 2016-08-14 10:56:38 +08:00
yuanke 91a64a67c5 微信注册和绑定判断BUG修改 2016-08-14 10:46:17 +08:00
huang 7c28f97208 get quality analisys update time 2016-08-14 10:45:01 +08:00
huang baa69e0787 Merge branch 'develop' into rep_quality 2016-08-14 10:36:00 +08:00
huang ff592c106e sonar最新触发时间获取 2016-08-14 10:29:52 +08:00
yuanke 56da43221d 修改绑定登录的地址 2016-08-14 10:28:46 +08:00
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