 txz
|
13576ca477
|
app.js
|
2016-04-14 09:43:43 +08:00 |
 cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-13 16:52:52 +08:00 |
|
cxt
|
f5122d7ef0
|
微信url切换到正式版
|
2016-04-13 14:52:18 +08:00 |
|
cxt
|
fcd1684658
|
作业列表按更新时间排序 作业列表左上角添加作业的下拉列表
|
2016-04-13 11:20:38 +08:00 |
|
cxt
|
a6f4b7f505
|
测试版
|
2016-04-12 16:23:52 +08:00 |
|
cxt
|
e420be8ee9
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/models/blog_comment.rb
|
2016-04-12 15:56:08 +08:00 |
|
txz
|
38c182d76a
|
作业发布者真名为空时，显示昵称
|
2016-04-12 15:51:18 +08:00 |
|
cxt
|
1882cd8f4f
|
用户姓名不显示
|
2016-04-12 15:42:59 +08:00 |
|
txz
|
3665597153
|
详情页面排版调整
|
2016-04-12 14:56:17 +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
|
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 |
|
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 |
|
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 |
|
txz
|
02a5e7752d
|
微信环境切换
|
2016-04-08 21:46:41 +08:00 |
|
cxt
|
281fcf315f
|
点击模板消息页面为空
|
2016-04-08 21:01:15 +08:00 |
|
huang
|
cd9ad535f5
|
1、修改默认图片
2、作品弹框问题
|
2016-04-08 20:44:09 +08:00 |
|
txz
|
0262e3b8ab
|
回复长单词显示问题
|
2016-04-08 18:46:46 +08:00 |
|
cxt
|
89330f9e40
|
调试
|
2016-04-08 17:03:48 +08:00 |
|
cxt
|
d6daa906b6
|
回复
|
2016-04-08 16:58:27 +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
|
1cb1835a1a
|
动态
|
2016-04-08 14:51:26 +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 |
|
guange
|
ef317089f1
|
错误信息打印到日志
|
2016-04-08 14:46:00 +08:00 |
|
guange
|
a35511195a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-08 14:42:39 +08:00 |
|
guange
|
abf4a80942
|
错误信息打印到日志
|
2016-04-08 14:42:23 +08:00 |
|
cxt
|
eee7b89388
|
项目动态
|
2016-04-08 14:38:35 +08:00 |
|
txz
|
707127631e
|
微信公众号样式调整
|
2016-04-08 14:07:49 +08:00 |
|
guange
|
4e50a9e289
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-08 10:45:10 +08:00 |
|
guange
|
aa9cb4e579
|
merge
|
2016-04-08 10:44:36 +08:00 |
|
txz
|
4ab96586de
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-08 10:10:19 +08:00 |
|
txz
|
f3738519e9
|
长单词折行问题
|
2016-04-08 10:10:08 +08:00 |
|
cxt
|
1503686ddb
|
无更多动态时不显示更多
|
2016-04-08 10:09:45 +08:00 |
|
huang
|
3501d6f1d6
|
完成组织模块的开发
|
2016-04-07 17:05:22 +08:00 |
|
cxt
|
bb71d1c322
|
调试模式
|
2016-04-07 16:59:46 +08:00 |
|
txz
|
411a8be8b8
|
点击展开
|
2016-04-07 16:58:06 +08:00 |
|
txz
|
139a7931ee
|
点赞功能修改
|
2016-04-07 16:39:04 +08:00 |
|
cxt
|
60c8320f82
|
praise api的修改
|
2016-04-07 15:42:08 +08:00 |
|
txz
|
938bf48d08
|
点赞功能修改
|
2016-04-07 15:26:23 +08:00 |
|
cxt
|
2fe32fda61
|
点赞的js
|
2016-04-07 15:17:42 +08:00 |