 guange
|
b010ce2e61
|
发送课程完成
|
2016-07-02 23:46:45 +08:00 |
|
guange
|
7fdfc02821
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-28 17:47:32 +08:00 |
 cxt
|
cbe34ea0a7
|
分组作业提交作品时关联成员列表为空
|
2016-06-28 15:57:56 +08:00 |
|
guange
|
436de8ce5a
|
优先取env中的wechat url
|
2016-06-28 11:33:54 +08:00 |
|
guange
|
57cdc1d5ec
|
协议修改
|
2016-06-28 11:30:06 +08:00 |
|
guange
|
5477c794ba
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-27 16:03:55 +08:00 |
 yuanke
|
ab99645148
|
Merge branch 'yuanke' into develop
|
2016-06-27 15:52:01 +08:00 |
|
yuanke
|
5c2ac3e02f
|
修改删除组织成员跨域的BUG
|
2016-06-27 15:47:06 +08:00 |
|
guange
|
05f09c4595
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-27 11:09:31 +08:00 |
|
guange
|
c501af70ba
|
.
|
2016-06-27 11:09:25 +08:00 |
 huang
|
46cde061a6
|
Merge branch 'rep_quality' into develop
Conflicts:
db/schema.rb
public/stylesheets/project.css
public/stylesheets/public.css
|
2016-06-24 19:17:26 +08:00 |
Your Name
|
c658296e2b
|
config
|
2016-06-24 19:12:07 +08:00 |
|
Your Name
|
537f152562
|
0
|
2016-06-24 18:47:54 +08:00 |
|
cxt
|
0d66763026
|
迟交扣分
|
2016-06-24 18:23:00 +08:00 |
|
guange
|
b5bfe40693
|
.
|
2016-06-24 17:35:55 +08:00 |
|
guange
|
9e61f2229e
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-24 17:15:10 +08:00 |
|
guange
|
084b545be9
|
修改为正式版
|
2016-06-24 17:14:58 +08:00 |
|
cxt
|
0611ddcc43
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
2016-06-24 16:54:19 +08:00 |
|
guange
|
2c2e1892e5
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-24 16:53:58 +08:00 |
|
cxt
|
76e7c50bf4
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
2016-06-24 16:52:00 +08:00 |
|
guange
|
4436e87c84
|
.
|
2016-06-24 16:35:27 +08:00 |
|
cxt
|
c0e58d19fa
|
导出的作业成绩中的缺评、迟交扣分应与作品列表的一致
|
2016-06-24 16:25:29 +08:00 |
|
Your Name
|
eae70f9c71
|
some config
|
2016-06-24 16:18:17 +08:00 |
|
cxt
|
afc8fad7fd
|
通过邀请码加入课程
|
2016-06-24 16:12:24 +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
|
da09983f9e
|
Merge branch 'weixin_guange' into cxt_course
|
2016-06-24 15:34:32 +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 |
|
Your Name
|
06fe02890f
|
index for sonar result
|
2016-06-24 14:59:17 +08:00 |
|
yuanke
|
86a5eccae6
|
组织设置中添加成员BUG解决
|
2016-06-24 14:16:39 +08:00 |
|
yuanke
|
64d87b7398
|
修改组织添加成员的BUG
|
2016-06-24 13:50:28 +08:00 |
|
Your Name
|
128f6721be
|
stoped the zhizhen
|
2016-06-24 13:00:02 +08:00 |
|
Your Name
|
de80403e8d
|
add address to config
|
2016-06-24 12:38:39 +08:00 |
|
cxt
|
bd3277681c
|
分组作业的作业成绩导出、学生列表的导出
|
2016-06-24 10:50:40 +08:00 |
|
Your Name
|
e6b263feb5
|
issues from sonar
|
2016-06-24 09:58:51 +08:00 |
|
guange
|
52d4d36097
|
邀请码页面
|
2016-06-24 09:01:12 +08:00 |
|
cxt
|
e457593416
|
作品列表--导出作业成绩：excel中增加缺评扣分、迟交扣分情况
|
2016-06-23 17:34:46 +08:00 |
|
Your Name
|
53b9cbee72
|
added hightcharts and added some api for sonar
|
2016-06-23 17:21:18 +08:00 |
|
cxt
|
126bf9c195
|
个人留言、课程留言的二级回复
|
2016-06-23 14:47:22 +08:00 |
|
Your Name
|
3fe5d9a1a3
|
get date froma sonar
|
2016-06-23 11:24:58 +08:00 |
|
guange
|
d466b09f3f
|
.
|
2016-06-22 17:20:34 +08:00 |
|
Your Name
|
ce6e6116b5
|
get data from sonar API
|
2016-06-22 17:09:54 +08:00 |
|
guange
|
1470cafe57
|
.
|
2016-06-22 17:09:49 +08:00 |
|
guange
|
9b42b4e7f7
|
.
|
2016-06-22 17:04:01 +08:00 |
|
guange
|
40217d5c56
|
.
|
2016-06-22 16:57:01 +08:00 |
|
guange
|
0929d2ac28
|
.
|
2016-06-22 16:48:34 +08:00 |