 z9hang
|
196ceff138
|
返回课程的接口补上当前用户是否为课程成员，课程老师信息
|
2015-02-12 15:51:52 +08:00 |
 sw
|
f64621fffa
|
Merge branch 'szzh' into develop
|
2015-02-12 09:05:18 +08:00 |
 alan
|
c00deabf75
|
修改《邮件样式》
Signed-off-by: alan <547533434@qq.com>
|
2015-02-12 00:15:10 +08:00 |
|
alan
|
aa8f58530c
|
给黄总提供接口
Signed-off-by: alan <547533434@qq.com>
|
2015-02-11 23:34:10 +08:00 |
|
alan
|
4bfc4493eb
|
添加《邮件周日发送》功能，修改《贴吧》邮件发送策略
Signed-off-by: alan <547533434@qq.com>
|
2015-02-11 20:23:50 +08:00 |
|
z9hang
|
a6882d0f88
|
获取所有课程及显示课程接口返回数据中添加当前用户是否是课程成员、及是否是课程教师字段
|
2015-02-10 17:03:59 +08:00 |
|
z9hang
|
e4442bfe04
|
用户课程、搜索课程接口返回数据添加当前用户是否是课程成员、及是否是课程老师两字段
|
2015-02-10 16:36:29 +08:00 |
|
z9hang
|
85782cdb8d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-10 10:30:10 +08:00 |
|
z9hang
|
3018ee206c
|
修改时间格式解析
|
2015-02-10 10:29:47 +08:00 |
|
sw
|
5ef1bc1d02
|
修改本地登录后报错
修改zh.yml文件异常
|
2015-02-10 10:21:46 +08:00 |
|
sw
|
73d2e2e5e2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-10 09:07:04 +08:00 |
whimlex
|
22aae1910b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/_search_project.html.erb
config/locales/en.yml
config/locales/zh.yml
|
2015-02-09 22:14:16 +08:00 |
|
whimlex
|
59a2c8283a
|
国际化结构调整
|
2015-02-09 22:07:21 +08:00 |
|
z9hang
|
103a411b40
|
修改用户搜索接口
|
2015-02-09 16:24:45 +08:00 |
|
sw
|
f380d781e7
|
增加根据已有课程复制成新课程的路由以及方法实现
|
2015-02-09 10:28:33 +08:00 |
|
sw
|
2ceb21b83b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-09 09:16:01 +08:00 |
|
alan
|
1166a1463b
|
Signed-off-by: alan <547533434@qq.com>
|
2015-02-07 09:33:54 +08:00 |
|
alan
|
7442cc1ca4
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into email_verify
|
2015-02-06 18:19:35 +08:00 |
|
alan
|
6e72e07028
|
Merge branch 'szzh' into email_verify
Conflicts:
Gemfile
Gemfile.lock
|
2015-02-06 18:16:20 +08:00 |
|
alan
|
6f9e2bad63
|
mail weekly
|
2015-02-06 18:15:08 +08:00 |
|
z9hang
|
d913f89a82
|
添加课程动态接口
|
2015-02-06 15:52:34 +08:00 |
|
z9hang
|
cc83b30fc6
|
修正搜索用户接口，添加课程动态接口
|
2015-02-06 14:29:42 +08:00 |
|
sw
|
859889b750
|
简化查询匿评数量的代码
|
2015-02-06 11:27:37 +08:00 |
|
sw
|
3c8f851c37
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-06 11:22:48 +08:00 |
|
sw
|
4cdb3c83dd
|
增加获取用户在指定课程内作业数量的接口
|
2015-02-06 11:22:29 +08:00 |
|
sw
|
0b41afa571
|
修改作业匿评界面，左侧附件名显示混乱
|
2015-02-06 10:51:29 +08:00 |
|
z9hang
|
cd25628208
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-06 10:36:06 +08:00 |
|
z9hang
|
b1903dba11
|
添加课程留言接口
|
2015-02-06 10:35:38 +08:00 |
 lizanle
|
d902d76ae2
|
将google统计换为了百度统计
|
2015-02-06 10:15:18 +08:00 |
|
sw
|
50244e6860
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-06 09:32:50 +08:00 |
|
sw
|
95b757ba09
|
修改问卷发布成功和取消发布成功后弹框提示样式
|
2015-02-06 09:32:32 +08:00 |
|
z9hang
|
0dfa428377
|
手机ＡＰＩ添加回复留言接口
|
2015-02-05 17:32:19 +08:00 |
|
z9hang
|
ef203ff40c
|
修正作业留言接口
|
2015-02-05 16:11:35 +08:00 |
|
z9hang
|
d6813e5996
|
项目新闻报错问题，作业留言接口
|
2015-02-05 15:54:50 +08:00 |
|
z9hang
|
d6b82c3549
|
修正课程通知评论接口
|
2015-02-04 14:39:46 +08:00 |
|
z9hang
|
4fdc1b97a5
|
配置API comment接口，修正显示课程通知接口未判断权限问题
|
2015-02-04 14:07:00 +08:00 |
|
z9hang
|
3cd97f8a70
|
API添加comment模块
|
2015-02-04 13:47:52 +08:00 |
|
z9hang
|
d1e2bfd6c4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-04 12:27:47 +08:00 |
|
z9hang
|
6d79c2cf83
|
手机端ＡＰＩ添加新闻评论实体Comment，新闻实体中引用Comment,课程新闻列表添加权限判断，并修正该接口不可用问题
|
2015-02-04 11:57:37 +08:00 |
|
sw
|
da56477ed0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-03 16:34:24 +08:00 |
|
sw
|
8c74a2f6a5
|
Merge branch 'develop' into szzh
|
2015-02-03 16:34:08 +08:00 |
|
z9hang
|
7e6d4e6215
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-03 16:03:49 +08:00 |
|
z9hang
|
8216453a02
|
匿评作品详情返回结果中添加comment_status字段 0:所属作业尚未开启匿评，1：匿评中 2：匿评结束
|
2015-02-03 16:03:30 +08:00 |
|
z9hang
|
87e658a0f1
|
修改评论接口，匿评结束后依然可以评论（属于留言）
|
2015-02-03 15:46:17 +08:00 |
 huang
|
59e7f2f28b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-03 15:23:05 +08:00 |
|
huang
|
8bef9420cf
|
修改企业版中自己能看到自己的私有项目
|
2015-02-03 15:22:45 +08:00 |
|
z9hang
|
9708c50899
|
添加作品评分接口
|
2015-02-03 15:10:21 +08:00 |
|
sw
|
a752ade770
|
#1922 测试版--平台上传附件功能，附件显示问题
|
2015-02-03 15:02:45 +08:00 |
|
sw
|
5c14ad4f89
|
Merge branch 'szzh' into develop
|
2015-02-03 11:26:30 +08:00 |
|
sw
|
6226974f0b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-03 11:25:31 +08:00 |