 cxt
|
00d79f2ed0
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-12 11:00:56 +08:00 |
|
cxt
|
275895f805
|
模板消息的重构
|
2016-04-12 11:00:47 +08:00 |
 txz
|
a6fcb072c0
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-11 15:11:12 +08:00 |
|
txz
|
f82ad97a68
|
详情页面回复框宽度问题
|
2016-04-11 15:11:01 +08:00 |
 guange
|
055ba00de5
|
绑定成功后关闭页面
|
2016-04-09 23:20:24 +08:00 |
|
guange
|
7c5d62b8a8
|
头像url不显示
|
2016-04-09 23:16:22 +08:00 |
|
guange
|
18f5f08bb7
|
Merge branch 'weixin_guange' into develop
|
2016-04-09 22:48:40 +08:00 |
|
guange
|
73ad787e23
|
修改到正式版
|
2016-04-09 22:48:10 +08:00 |
|
cxt
|
5e3e2e64a9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-09 18:35:07 +08:00 |
|
cxt
|
40dba4d463
|
Merge branch 'develop_new' into develop
|
2016-04-09 18:34:51 +08:00 |
|
guange
|
beec2b3246
|
merge
|
2016-04-09 18:17:07 +08:00 |
|
guange
|
cadb5f3f15
|
更换服务器至test.course.trustie.net
|
2016-04-09 18:15:54 +08:00 |
 huang
|
a2a3d6b6b9
|
Merge remote-tracking branch 'remotes/origin/weixin_guange' into develop
Conflicts:
app/models/blog_comment.rb
|
2016-04-09 17:01:20 +08:00 |
|
cxt
|
c041f742c1
|
缺陷和留言的回复
|
2016-04-09 16:21:13 +08:00 |
|
guange
|
2d41d0a2f6
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-09 16:02:24 +08:00 |
|
cxt
|
007fee95bd
|
作业和留言回复的模板消息
|
2016-04-09 14:41:45 +08:00 |
|
cxt
|
3f365e75b5
|
讨论区的模板消息
|
2016-04-09 14:13:59 +08:00 |
|
cxt
|
b6adaf61db
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-09 13:29:34 +08:00 |
|
cxt
|
930d95f8b5
|
私有动态不显示的问题
|
2016-04-09 13:29:26 +08:00 |
|
guange
|
96dfeead0f
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-08 21:46:56 +08:00 |
|
txz
|
02a5e7752d
|
微信环境切换
|
2016-04-08 21:46:41 +08:00 |
|
huang
|
ab34fec172
|
资源导入的时候记数没有自动增加问题
|
2016-04-08 21:30:59 +08:00 |
|
huang
|
3f3048a51b
|
组织私有课程、项目关联提示
|
2016-04-08 21:04:06 +08:00 |
|
cxt
|
281fcf315f
|
点击模板消息页面为空
|
2016-04-08 21:01:15 +08:00 |
|
huang
|
f951d22d56
|
发布博客500问题
|
2016-04-08 20:53:30 +08:00 |
|
huang
|
cd9ad535f5
|
1、修改默认图片
2、作品弹框问题
|
2016-04-08 20:44:09 +08:00 |
|
guange
|
9ae030ed9e
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-04-08 20:02:40 +08:00 |
|
guange
|
3ff19364dc
|
merge
|
2016-04-08 20:02:19 +08:00 |
|
cxt
|
845b1cdab8
|
模板
|
2016-04-08 19:54:33 +08:00 |
|
cxt
|
6f1878f120
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-08 18:52:42 +08:00 |
|
cxt
|
440ba27fa4
|
回复
|
2016-04-08 18:52:26 +08:00 |
|
txz
|
0262e3b8ab
|
回复长单词显示问题
|
2016-04-08 18:46:46 +08:00 |
|
huang
|
cb9fd1d2ba
|
Merge branch 'hjq_beidou' into develop
|
2016-04-08 18:20:58 +08:00 |
|
huang
|
9f44babff5
|
去掉作业提交附件中用户名
|
2016-04-08 18:20:06 +08:00 |
|
guange
|
3ba7372523
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-08 17:34:11 +08:00 |
|
guange
|
612b79410b
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-08 17:33:41 +08:00 |
|
guange
|
b627513bae
|
中文问题
|
2016-04-08 17:33:00 +08:00 |
|
cxt
|
89330f9e40
|
调试
|
2016-04-08 17:03:48 +08:00 |
|
cxt
|
d6daa906b6
|
回复
|
2016-04-08 16:58:27 +08:00 |
|
huang
|
5b744093af
|
回复application编码问题代码
|
2016-04-08 16:41:33 +08:00 |
|
huang
|
9fa50e0452
|
编码问题
|
2016-04-08 16:19:38 +08:00 |
|
cxt
|
de8d630fc1
|
解决冲突
|
2016-04-08 16:02:10 +08:00 |
|
cxt
|
fcddaf403c
|
删除博客为空的数据
|
2016-04-08 15:59:23 +08:00 |
|
txz
|
c88e924843
|
博客留言html内容转义
|
2016-04-08 15:31:43 +08:00 |
|
cxt
|
bd19913db8
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-08 14:51:33 +08:00 |
|
guange
|
8dc47c9bd3
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-08 14:51:46 +08:00 |
|
cxt
|
1cb1835a1a
|
动态
|
2016-04-08 14:51:26 +08:00 |
|
guange
|
c5b1ffb42f
|
错误信息打印到日志
|
2016-04-08 14:50:49 +08:00 |
|
cxt
|
c5048d7c72
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-08 14:46:49 +08:00 |
|
cxt
|
e007ee58ef
|
博客动态
|
2016-04-08 14:46:42 +08:00 |