 sw
|
a64671f9de
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-05 09:27:26 +08:00 |
|
sw
|
bcc8abdee9
|
1、增加组织相关数据表
2、增加组织和项目的关联关系
|
2015-03-05 09:27:13 +08:00 |
 z9hang
|
d1651f7252
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-05 09:26:33 +08:00 |
|
z9hang
|
d01aa5f15c
|
关注接口限制不能关注自己
|
2015-03-05 09:26:13 +08:00 |
|
sw
|
ef5b7c9fca
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-05 08:45:53 +08:00 |
|
sw
|
7f249d29f4
|
修整页面代码
|
2015-03-05 08:45:32 +08:00 |
|
z9hang
|
199ef4ebe6
|
匿评作品详情列表补上cur_page字段
|
2015-03-04 17:14:09 +08:00 |
|
z9hang
|
509a37a575
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-04 17:04:37 +08:00 |
|
z9hang
|
411d201fc3
|
作业详情接口添加留言列表
|
2015-03-04 17:04:07 +08:00 |
|
sw
|
a2d986f70c
|
修改页面代码
|
2015-03-04 16:55:25 +08:00 |
 lizanle
|
7ee58d1d44
|
项目动态重写，并去掉首页缓存
|
2015-03-04 15:32:00 +08:00 |
|
sw
|
2e70d0d167
|
Merge branch 'develop' into szzh
|
2015-03-04 11:34:19 +08:00 |
|
sw
|
032e28067d
|
#1959 项目评分是0的，就不显示了！
|
2015-03-04 11:34:01 +08:00 |
|
sw
|
650d717823
|
Merge branch 'szzh' into develop
|
2015-03-04 10:03:45 +08:00 |
|
sw
|
33e9a3e326
|
#1958 关注有用户0个后边取消冒号
|
2015-03-04 10:02:40 +08:00 |
|
sw
|
5bba54432d
|
#1930 项目缺陷显示个数修改
|
2015-03-04 09:52:01 +08:00 |
|
sw
|
2c4e864080
|
#1949 学生可以通过url访问老师并未发布的问卷并进行作答
|
2015-03-03 17:53:15 +08:00 |
|
sw
|
da21e61afd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-03 17:37:27 +08:00 |
|
z9hang
|
b9643390a6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-03 17:36:30 +08:00 |
|
z9hang
|
451a022d5f
|
作业详情、作业列表返回数据修改
|
2015-03-03 17:36:05 +08:00 |
|
sw
|
9233213127
|
修复未登录时进入指定学校课程列表显示却是国防科大课程列表的BUG
|
2015-03-03 17:35:46 +08:00 |
 alan
|
0ba6c6d3ba
|
还原memcached修改的文件[memcache实验还没弄好]
Signed-off-by: alan <547533434@qq.com>
|
2015-03-03 16:03:59 +08:00 |
|
alan
|
2caf2ddf30
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-03-03 16:02:24 +08:00 |
|
z9hang
|
7b5eb9db8b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-03 09:12:12 +08:00 |
|
z9hang
|
32264fb4a6
|
课程动态接口修改为用户所有课程动态接口
|
2015-03-03 09:11:47 +08:00 |
|
sw
|
bbeaa6e80c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-02 17:43:16 +08:00 |
|
sw
|
90d9e77b32
|
修复课程主页没有2015年课程
|
2015-03-02 17:31:04 +08:00 |
|
alan
|
22ac578ede
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
2015-03-02 14:50:10 +08:00 |
|
alan
|
f374bfd7e2
|
修复《窗口跳转问题》
Signed-off-by: alan <547533434@qq.com>
|
2015-03-02 14:47:50 +08:00 |
|
sw
|
d999a9f4a6
|
修复新建课程时报错的BUG
|
2015-03-02 14:33:35 +08:00 |
|
z9hang
|
18271946d7
|
作业详情，课程作业列表接口返回数据格式修改（增加了作业作者相关信息）
|
2015-03-01 17:31:38 +08:00 |
|
z9hang
|
2f762973b4
|
课程动态接口返回数据格式修改
|
2015-03-01 16:32:10 +08:00 |
|
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 |