 guange
|
2c2e1892e5
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-24 16:53:58 +08:00 |
|
guange
|
c39a982093
|
二维码
|
2016-06-24 16:51:40 +08:00 |
|
guange
|
4436e87c84
|
.
|
2016-06-24 16:35:27 +08:00 |
|
guange
|
657e506071
|
.
|
2016-06-24 15:45:50 +08:00 |
|
guange
|
9a9f6400da
|
.
|
2016-06-24 15:42:00 +08:00 |
|
guange
|
c522d7160c
|
.
|
2016-06-24 15:40:27 +08:00 |
|
guange
|
9ec1f916b6
|
.
|
2016-06-24 15:38:46 +08:00 |
|
guange
|
7e2482167d
|
.
|
2016-06-24 15:31:45 +08:00 |
|
guange
|
16a9f017b6
|
error
|
2016-06-24 15:28:44 +08:00 |
 yuanke
|
c6be37020f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
2016-06-24 15:11:52 +08:00 |
|
guange
|
485d0e3743
|
ticket处理
|
2016-06-24 14:59:50 +08:00 |
|
yuanke
|
c61c14fa97
|
Merge branch 'yuanke' into develop
|
2016-06-24 14:35:59 +08:00 |
|
yuanke
|
86a5eccae6
|
组织设置中添加成员BUG解决
|
2016-06-24 14:16:39 +08:00 |
|
guange
|
e21f4e0b4d
|
merge
|
2016-06-24 13:52:11 +08:00 |
|
yuanke
|
64d87b7398
|
修改组织添加成员的BUG
|
2016-06-24 13:50:28 +08:00 |
|
guange
|
f9075e08ba
|
merge
|
2016-06-24 13:35:26 +08:00 |
|
guange
|
d348981721
|
加入邀请码
|
2016-06-24 13:29:36 +08:00 |
|
yuanke
|
2a971c3bc6
|
修改有的组织添加成员的BUG
|
2016-06-24 11:24:48 +08:00 |
 cxt
|
2959391438
|
作业列表：没有作业时下拉框被点击后，显示一条记录：目前尚未发布作业
|
2016-06-24 11:20:48 +08:00 |
|
cxt
|
a41d18dd0e
|
编程作业的作品详情在顶部增加“收起”
|
2016-06-24 11:02:29 +08:00 |
|
cxt
|
bd3277681c
|
分组作业的作业成绩导出、学生列表的导出
|
2016-06-24 10:50:40 +08:00 |
|
guange
|
52d4d36097
|
邀请码页面
|
2016-06-24 09:01:12 +08:00 |
|
cxt
|
e457593416
|
作品列表--导出作业成绩：excel中增加缺评扣分、迟交扣分情况
|
2016-06-23 17:34:46 +08:00 |
|
cxt
|
a9b79246f9
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-23 15:05:22 +08:00 |
|
cxt
|
8940c5f4ca
|
禁用匿评的作品列表不应显示“导出匿评情况、导出缺评情况”链接
|
2016-06-23 15:05:16 +08:00 |
 Tim
|
563fb3b459
|
控制table拖拽不靠在一起
|
2016-06-23 14:58:40 +08:00 |
|
cxt
|
126bf9c195
|
个人留言、课程留言的二级回复
|
2016-06-23 14:47:22 +08:00 |
|
guange
|
d466b09f3f
|
.
|
2016-06-22 17:20:34 +08:00 |
|
guange
|
1470cafe57
|
.
|
2016-06-22 17:09:49 +08:00 |
|
guange
|
9b42b4e7f7
|
.
|
2016-06-22 17:04:01 +08:00 |
|
guange
|
fc5895e74f
|
.
|
2016-06-22 17:02:33 +08:00 |
|
guange
|
40217d5c56
|
.
|
2016-06-22 16:57:01 +08:00 |
|
guange
|
0929d2ac28
|
.
|
2016-06-22 16:48:34 +08:00 |
|
guange
|
7700445c17
|
加入课程
|
2016-06-22 16:42:20 +08:00 |
|
guange
|
8129e29d5b
|
.
|
2016-06-22 12:52:26 +08:00 |
|
guange
|
f791f37205
|
.
|
2016-06-22 12:36:46 +08:00 |
|
guange
|
5b087179eb
|
.
|
2016-06-22 12:31:47 +08:00 |
|
guange
|
833c5a5ede
|
.
|
2016-06-22 12:27:23 +08:00 |
|
guange
|
4663f48496
|
修改跳转菜单
|
2016-06-22 12:13:50 +08:00 |
|
guange
|
13273d02de
|
修正了安全问题，不暴露openid
|
2016-06-22 12:11:34 +08:00 |
|
guange
|
b6892cfc2d
|
把angularjs换成7牛cdn
|
2016-06-22 10:00:07 +08:00 |
|
cxt
|
1b12c56960
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-21 16:53:36 +08:00 |
|
cxt
|
3f8beaf97c
|
动态回复banner的代码重构
|
2016-06-21 16:53:31 +08:00 |
|
Tim
|
fd765b1d73
|
设置课程大纲弹框js控制
|
2016-06-21 15:17:24 +08:00 |
|
cxt
|
7e25ec1a00
|
登录报500
|
2016-06-21 15:07:37 +08:00 |
|
Tim
|
1a4865be09
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-21 15:03:51 +08:00 |
|
cxt
|
44334913ee
|
未读消息弹窗漏了一条消息
|
2016-06-21 14:28:26 +08:00 |
|
cxt
|
4a12b56223
|
Merge branch 'cxt_course' into develop
|
2016-06-21 13:58:50 +08:00 |
|
cxt
|
c4cea93a44
|
消息列表的“展开更多”指针手势修改
|
2016-06-21 13:58:17 +08:00 |
|
cxt
|
2176ad1ede
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-21 11:18:37 +08:00 |