 z9hang
|
2c49dad4dc
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
2015-01-06 15:49:24 +08:00 |
 guange
|
59f687bb6a
|
added homework
|
2015-01-05 19:53:25 +08:00 |
|
z9hang
|
58c31b1d7f
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
2015-01-05 17:47:14 +08:00 |
|
z9hang
|
f252438f85
|
修改编辑课程接口
|
2015-01-05 17:47:04 +08:00 |
|
guange
|
b1125e7d7e
|
编辑课程改为put
|
2015-01-05 17:45:47 +08:00 |
|
guange
|
a3ed599d49
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
2015-01-05 17:45:14 +08:00 |
|
z9hang
|
f55d8fe303
|
1、修正新建课程接口无效问题。2、修正新建课程接口返回的数据中课程名称错误问题
|
2015-01-05 16:58:11 +08:00 |
|
z9hang
|
b5da95d5ce
|
修改错误
|
2015-01-05 10:15:14 +08:00 |
|
guange
|
d97b26f131
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
2015-01-04 14:55:53 +08:00 |
|
guange
|
d7cad23854
|
加上作业
|
2015-01-04 14:55:45 +08:00 |
|
hhuai
|
d1846e6303
|
for update
|
2015-01-04 11:53:16 +08:00 |
|
z9hang
|
550577e942
|
修改编辑用户接口的返回值
|
2014-12-23 17:43:53 +08:00 |
|
z9hang
|
ec0c85dc54
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
2014-12-23 15:55:59 +08:00 |
|
z9hang
|
40d06011f8
|
修改用户的课程列表接口
|
2014-12-23 15:54:57 +08:00 |
|
z9hang
|
50a242a56b
|
test
|
2014-12-23 15:38:45 +08:00 |
|
z9han
|
4518fe4355
|
test
|
2014-12-23 15:35:22 +08:00 |
|
z9han
|
5ee37f32e2
|
课程学生列表、教师列表接口报错问题
|
2014-12-23 15:24:18 +08:00 |
|
z9han
|
d7557e2839
|
修改密码返回错误问题
|
2014-12-23 14:46:23 +08:00 |
|
z9han
|
93762e89d3
|
修改加入课程、退出课程接口调用，添加创建课程，编辑课程的参数说明
|
2014-12-23 11:07:17 +08:00 |
|
guange
|
7f1826ebf2
|
修改个人信息
|
2014-12-23 10:22:05 +08:00 |
|
guange
|
9d99eee92e
|
用户密码修改没传userid
|
2014-12-23 10:16:23 +08:00 |
|
guange
|
d6aadc1624
|
搜索和列表中的课程老师输出一致
|
2014-12-23 10:05:29 +08:00 |
|
guange
|
8fe5fee0f0
|
搜索课程报错
|
2014-12-23 09:44:31 +08:00 |
 =
|
9b51a25a26
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
Conflicts:
app/services/homework_service.rb
|
2014-12-20 13:07:02 +08:00 |
|
=
|
57091b34f4
|
老师、学生匿评列表
|
2014-12-20 13:00:13 +08:00 |
|
z9han
|
ddba71decf
|
个人的所有课程接口、课程的所有课程接口及留言接口
|
2014-12-19 17:37:37 +08:00 |
|
=
|
226d5e9889
|
修改作业详、匿评
新增作品留言
|
2014-12-18 17:20:21 +08:00 |
|
=
|
93c7deebc4
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
2014-12-18 14:51:37 +08:00 |
|
=
|
53d85136a3
|
修改课程中一个错误，完善匿评
|
2014-12-18 14:48:14 +08:00 |
|
guange
|
03f2c9c192
|
关注返回规范化
|
2014-12-18 13:37:23 +08:00 |
|
=
|
bb23468c7d
|
Merge branch 'szzh' into api
Conflicts:
app/controllers/account_controller.rb
app/controllers/courses_controller.rb
db/schema.rb
|
2014-12-17 16:41:28 +08:00 |
|
=
|
428d1b6415
|
个人课程列表、作业详情、作品详情
|
2014-12-17 14:50:57 +08:00 |
|
guange
|
f9aa145c2b
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
2014-12-15 20:17:45 +08:00 |
|
guange
|
4df9544770
|
关注列表返回优化
|
2014-12-15 20:17:35 +08:00 |
|
z9han
|
7f9386180d
|
部分接口添加权限验证接口、新闻详情及对应评论接口
|
2014-12-15 16:53:20 +08:00 |
|
guange
|
df18eac875
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
2014-12-15 14:06:08 +08:00 |
|
guange
|
6cb3f9e53c
|
注册用户时好多用户字段没有，默认为null
|
2014-12-15 14:06:00 +08:00 |
|
z9hang
|
36967eeec0
|
修改注册接口、添加作业列表接口
|
2014-12-15 13:44:26 +08:00 |
|
z9hang
|
95d8c1a09d
|
修改课程成员列表接口，增加权限判断
|
2014-12-15 10:41:09 +08:00 |
 sw
|
9080ff79a0
|
Merge branch 'develop' into szzh
|
2014-12-15 09:20:02 +08:00 |
|
sw
|
5343ee2cfb
|
当评分为0分时显示为未评分
|
2014-12-15 09:19:20 +08:00 |
|
sw
|
9ffe32e121
|
修改老师第一次可以不对学生作业进行评分，只进行评价
|
2014-12-15 09:10:21 +08:00 |
|
guange
|
efa08adf4e
|
认证用普通模式返回
|
2014-12-14 21:01:23 +08:00 |
|
guange
|
ee988b6ec5
|
补全课程和用户接口
|
2014-12-13 21:52:26 +08:00 |
|
sw
|
b96de32b28
|
Merge branch 'szzh' into develop
|
2014-12-12 18:07:18 +08:00 |
|
z9hang
|
9abe730dff
|
恢复私有课程的公开资源不能引用问题（导致搜索速度慢）
|
2014-12-12 18:06:10 +08:00 |
|
sw
|
7268acf3c6
|
Merge branch 'szzh' into develop
|
2014-12-12 16:59:53 +08:00 |
|
z9hang
|
e4439daf3b
|
全站搜索bug
|
2014-12-12 16:59:18 +08:00 |
|
sw
|
520597b065
|
Merge branch 'szzh' into develop
|
2014-12-12 16:54:37 +08:00 |
|
z9hang
|
c0a0c41e14
|
私有课程的公开资源能下载bug
|
2014-12-12 16:53:49 +08:00 |