Commit Graph

146 Commits

Author SHA1 Message Date
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
txz 48e26fce62 冲突解决 2016-04-05 10:43:51 +08:00
txz 8c7de04dbf 项目问答详情页面 2016-04-05 10:30:25 +08:00
guange 36f3e3a46c 改为angularjs实现 2016-04-04 22:24:13 +08:00
guange 7d4de36521 修改openid调用位置 2016-04-02 07:39:46 +08:00
guange 5839959f0a 修改openid调用位置 2016-04-02 07:32:40 +08:00
cxt 9da89ef5e2 课程通知的回复 2016-04-02 00:37:24 +08:00
cxt d47f887fd1 issue回复的修改 2016-04-01 23:48:29 +08:00
cxt bc5e455f0f 解决冲突 2016-04-01 23:25:19 +08:00
cxt 790b452a9b issue回复 2016-04-01 23:22:39 +08:00
txz d45604c4a0 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 23:21:25 +08:00
txz 3b70970651 问题跟踪详情页面修改 2016-04-01 23:21:18 +08:00
cxt cc2fe6108a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 22:38:57 +08:00
cxt 5e697e5367 作业的回复 2016-04-01 22:38:45 +08:00
txz 0d24de7198 详情页面回复 2016-04-01 22:35:44 +08:00
txz 58e5fe85c3 issue 详情页面 2016-04-01 21:28:25 +08:00
txz 4902361b3f 冲突解决 2016-04-01 20:56:50 +08:00
txz 596bf641ac 最新动态各详情页面 2016-04-01 20:53:21 +08:00
cxt b3b0488bf5 动态点击更多 2016-04-01 20:46:38 +08:00
Yiang Gan 4088fb9cb4 课程作业详情页面 2016-04-01 14:58:41 +08:00
Yiang Gan 392c5708f2 作业详情页面 2016-03-31 20:43:06 +08:00
Yiang Gan 6dc374cf9a 最新动态 2016-03-30 17:41:18 +08:00
Yiang Gan 4de598873f 动态和作业的api 2016-03-30 10:32:45 +08:00
Tim 406bb7930c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
	public/javascripts/wechat/wechat-dev.js
2016-03-28 14:47:11 +08:00
Tim a9fd79ec63 微信动态筛选 2016-03-28 14:45:11 +08:00
guange d5124e128e 添加调试功能 2016-03-26 15:56:36 +08:00
guange 60931dde6a 添加获取openid的功能 2016-03-26 15:52:14 +08:00
Tim 4f7d698076 wechat init 2016-03-26 14:45:57 +08:00
luoquan 901409ebb4 Merge branch 'yuanke' into luoquan
Conflicts:
	public/assets/kindeditor/kindeditor.js
2016-03-11 14:40:07 +08:00
luoquan 1900a824e8 0 2016-03-11 14:39:17 +08:00
luoquan 033c7991e1 修改媒体播放 2016-03-11 13:16:44 +08:00
luoquan a418c0937d Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan
Conflicts:
	public/assets/kindeditor/kindeditor.js
	public/assets/kindeditor/plugins/code/previewcode.css
2016-03-11 10:21:59 +08:00
luoquan 62f91865e0 kindeditor视频添加默认图片 2016-03-11 10:21:16 +08:00
luoquan e80caf87b2 还原行距问题 2016-03-11 09:52:36 +08:00