 yuanke
|
f63df877db
|
将未命名课程去掉
|
2016-07-13 08:44:20 +08:00 |
 txz
|
2cc87f1dd8
|
课程页面各tab显示bug
|
2016-07-12 17:33:55 +08:00 |
 huang
|
191261d3b8
|
each time to 10s
|
2016-07-12 17:30:29 +08:00 |
|
yuanke
|
4a7fb0e0b5
|
点击查看班级详情跳入班级信息页面
|
2016-07-12 17:08:16 +08:00 |
|
yuanke
|
824f9d9174
|
新增创建班级的模版消息
|
2016-07-12 17:00:01 +08:00 |
 guange
|
4908a68a7d
|
时间utc问题
|
2016-07-12 16:49:15 +08:00 |
|
Tim
|
73b7b00db9
|
班级学生列表导航栏下拉框错位调整
|
2016-07-12 16:45:04 +08:00 |
|
guange
|
ae3212082c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-12 16:35:15 +08:00 |
|
guange
|
8df0dcae7a
|
调用编辑接口不成功时，打印具体的信息
|
2016-07-12 16:35:06 +08:00 |
 cxt
|
c46fcc48b1
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/users/_join_course_course_message.html.erb
|
2016-07-12 16:26:13 +08:00 |
|
huang
|
e766adf087
|
add delete to qa
|
2016-07-12 16:23:30 +08:00 |
|
cxt
|
f0e456729e
|
过滤掉消息中的html
|
2016-07-12 16:21:30 +08:00 |
|
yuanke
|
2844ac2e65
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-12 15:52:08 +08:00 |
|
yuanke
|
d75e2b740f
|
微信点击我的课程里面的两个按钮时没绑定会提示绑定
|
2016-07-12 15:51:58 +08:00 |
|
txz
|
78a6785b6b
|
微信回复框自动增高
|
2016-07-12 15:18:51 +08:00 |
|
txz
|
77f5ad09d2
|
各详情页面回复内容全部显示
|
2016-07-12 15:00:49 +08:00 |
|
txz
|
717bbe2ffa
|
回复框多行提交后初始化
|
2016-07-12 14:33:52 +08:00 |
|
txz
|
4434eb3620
|
回复框固定在最下显示
|
2016-07-12 14:10:30 +08:00 |
|
txz
|
9d91e9397b
|
微信邀请码提示文字修改
|
2016-07-12 11:01:01 +08:00 |
|
txz
|
f33feb7d84
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-12 10:43:26 +08:00 |
|
txz
|
243f0bbe7d
|
微信详情内容与回复中链接添加蓝色
|
2016-07-12 10:43:21 +08:00 |
|
cxt
|
955c258856
|
复制班级的弹框中“课程名称”下拉框中只显示当前登录用户的所有课程
|
2016-07-12 10:35:52 +08:00 |
|
yuanke
|
4111ae632c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-12 10:25:28 +08:00 |
|
yuanke
|
d4681eea00
|
我的资源里面显示来源 和大小 并可以下载课件
|
2016-07-12 10:25:18 +08:00 |
|
cxt
|
66c40ba139
|
动态的更新时间
|
2016-07-12 09:41:00 +08:00 |
|
txz
|
e3fe95213f
|
增加二级回复与文字间距离
|
2016-07-12 09:34:06 +08:00 |
|
cxt
|
89819f5ccd
|
消息列表
|
2016-07-11 17:33:11 +08:00 |
|
huang
|
22745edb9b
|
Merge branch 'rep_quality' into develop
|
2016-07-11 17:02:25 +08:00 |
|
huang
|
8b5a2ac1cb
|
message 500
|
2016-07-11 16:59:37 +08:00 |
|
yuanke
|
14b7b04e4d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-11 16:55:56 +08:00 |
|
txz
|
dc6127eb78
|
微信我的资源样式更改
|
2016-07-11 16:54:58 +08:00 |
|
yuanke
|
70ed5790b8
|
修改在动态详情点赞返回和点赞状态不一致的BUG
|
2016-07-11 16:46:07 +08:00 |
|
cxt
|
d21eaf9154
|
未配置班级列表的班级重命名
|
2016-07-11 15:32:01 +08:00 |
|
cxt
|
b4e6561e50
|
Merge branch 'cxt_course' into develop
|
2016-07-11 15:16:27 +08:00 |
|
cxt
|
d71e10c8ac
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-11 15:16:04 +08:00 |
|
cxt
|
0b4db97756
|
班级动态
|
2016-07-11 15:15:38 +08:00 |
|
cxt
|
5d9bde3c95
|
课程发送资源到课程
|
2016-07-11 15:10:55 +08:00 |
|
txz
|
cf304c2b68
|
dot.png图片更新
|
2016-07-11 15:10:52 +08:00 |
|
yuanke
|
627135ec12
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-11 14:50:10 +08:00 |
|
yuanke
|
374aa9918c
|
我的资源里面都显示未发布的，新建课程后返回会刷新数据
|
2016-07-11 14:49:59 +08:00 |
|
txz
|
bd29859a28
|
创建课程和参与课程区分样式
|
2016-07-11 14:46:35 +08:00 |
|
cxt
|
834e72b0f8
|
未配置班级列表报500，全部班级列表添加状态列表明班级是否已删除
|
2016-07-11 14:43:22 +08:00 |
|
txz
|
0093a0a509
|
微信邀请提示文字更改
|
2016-07-11 14:23:53 +08:00 |
|
Tim
|
a0db221ffc
|
Merge branch 'develop' into cs_optimize_txz
|
2016-07-11 13:57:04 +08:00 |
|
Tim
|
1aee5b6955
|
将大纲中共用样式提出；个性签名resize：none
|
2016-07-11 13:56:03 +08:00 |
|
huang
|
1283690250
|
Merge branch 'rep_quality' into develop
|
2016-07-11 11:34:07 +08:00 |
|
huang
|
0a001b4f76
|
message 500 for boliang
|
2016-07-11 11:29:15 +08:00 |
|
Tim
|
76803e90d1
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-07-11 11:24:34 +08:00 |
|
huang
|
93e79d9419
|
add hidden to css
|
2016-07-11 11:23:59 +08:00 |
|
Tim
|
944362aa66
|
schema.rb文件
|
2016-07-11 11:22:56 +08:00 |