 z9hang
|
cb88dd9064
|
添加td_tech_title非空判断
|
2014-11-24 17:12:12 +08:00 |
 zhuhao
|
76120a460b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 17:06:29 +08:00 |
|
z9hang
|
ccaf2f8ee5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 17:06:02 +08:00 |
 sw
|
198e2f24ae
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 17:04:40 +08:00 |
|
sw
|
f5306c503a
|
修改留言界面留言、清除留言按钮显示样式不正确
|
2014-11-24 17:04:09 +08:00 |
|
sw
|
760203ebc7
|
作业内回复改为实名回复
|
2014-11-24 16:59:56 +08:00 |
|
sw
|
175ac86217
|
修复课程-课程作业：回复匿评相关问题 #1566
|
2014-11-24 16:51:27 +08:00 |
|
zhuhao
|
2e5213fa18
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 16:45:37 +08:00 |
|
sw
|
88764f1a4b
|
修复老师评分时删除评论不可用#1574
|
2014-11-24 16:35:37 +08:00 |
|
z9hang
|
f4af0633a3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 16:31:11 +08:00 |
|
sw
|
66e2edef0a
|
修复开启匿评之后学生可在作业详细信息列表里提交作业
|
2014-11-24 16:06:07 +08:00 |
|
sw
|
edd68baa85
|
修改当作业没有附件时老师能打包下载一个空包的问题
|
2014-11-24 15:56:23 +08:00 |
|
zhuhao
|
535ec333c3
|
显示字样的改动：项目改为课程
|
2014-11-24 15:36:58 +08:00 |
 alan
|
c4e64f29da
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-24 15:29:35 +08:00 |
|
alan
|
6363208781
|
修改base_user
Signed-off-by: alan <547533434@qq.com>
|
2014-11-24 15:29:19 +08:00 |
|
zhuhao
|
da9773e139
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 15:28:13 +08:00 |
|
zhuhao
|
6b98c2995a
|
添加标签按钮样式调整
|
2014-11-24 15:27:43 +08:00 |
|
sw
|
f1aca94a30
|
老师配置课程时成员列表显示异常
|
2014-11-24 15:03:34 +08:00 |
|
sw
|
adf75d2e8a
|
修改匿评结束显示样式
|
2014-11-24 15:00:20 +08:00 |
|
sw
|
2042555813
|
修改老师启动匿评之后按妞显示样式不正确的BUG
|
2014-11-24 14:55:10 +08:00 |
|
z9hang
|
d9a7e2181c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 14:39:51 +08:00 |
|
z9hang
|
feccad8fa5
|
用户为创建课程，或没有作为教师的课程时，不显示引入我的课程按钮
|
2014-11-24 14:39:31 +08:00 |
|
alan
|
d7d49d2fbd
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-24 11:33:54 +08:00 |
|
alan
|
76589ade20
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/models/user.rb
app/views/account/login.html.erb
|
2014-11-24 11:32:53 +08:00 |
|
z9hang
|
c5fcb9168e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 11:26:45 +08:00 |
|
z9hang
|
e87238497c
|
课程资源库：鼠标移过时改变搜索按钮的颜色
|
2014-11-24 11:26:29 +08:00 |
|
alan
|
584944059a
|
huanyuan
Signed-off-by: alan <547533434@qq.com>
|
2014-11-24 11:25:23 +08:00 |
|
alan
|
735cb44877
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-24 10:49:10 +08:00 |
|
alan
|
526e9bc923
|
修改《IE登录不了》
Signed-off-by: alan <547533434@qq.com>
|
2014-11-24 10:48:53 +08:00 |
|
z9hang
|
897b06cd0e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 10:06:57 +08:00 |
|
z9hang
|
79e37fbf2c
|
关联了项目的作业附件提交不了
|
2014-11-24 10:06:34 +08:00 |
|
zhuhao
|
4a2b5f5e9a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 09:22:04 +08:00 |
|
zhuhao
|
b222b7a8ed
|
资源库讨论区发帖按钮样式调整
|
2014-11-24 09:21:48 +08:00 |
|
alan
|
90e4387395
|
修复登录
Signed-off-by: alan <547533434@qq.com>
|
2014-11-24 09:08:49 +08:00 |
|
alan
|
4221f5edb3
|
<还原>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-23 11:48:59 +08:00 |
|
alan
|
6963d494ae
|
还原《注册》
Signed-off-by: alan <547533434@qq.com>
|
2014-11-23 10:44:51 +08:00 |
|
alan
|
949867c50b
|
Signed-off-by: alan <547533434@qq.com>
|
2014-11-23 09:36:47 +08:00 |
|
alan
|
3417b2bce1
|
还原《登录跳转》
Signed-off-by: alan <547533434@qq.com>
|
2014-11-22 22:50:48 +08:00 |
|
alan
|
6356596f08
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-22 17:49:34 +08:00 |
|
alan
|
88ab53730b
|
修改bug《登录密码错误报错》
Signed-off-by: alan <547533434@qq.com>
|
2014-11-22 17:45:09 +08:00 |
|
sw
|
7d4afa5766
|
Merge branch 'szzh' into develop
|
2014-11-22 16:12:05 +08:00 |
|
sw
|
ee53ec544f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-22 16:11:33 +08:00 |
|
sw
|
ca7b56cbf0
|
修改当作业提交大于等于2份时才显示开启匿评按钮
|
2014-11-22 15:56:42 +08:00 |
|
sw
|
13bf91f954
|
1.修改课程作业列表中、启动、关闭匿评、提交作业、编辑等按钮不见的问题
2.修改匿评、提交评论的样式
|
2014-11-22 15:50:14 +08:00 |
|
z9hang
|
3784149112
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-22 15:35:46 +08:00 |
|
z9hang
|
0a6574b542
|
课程主页新建课程按钮，修改为所有人都可以看到
|
2014-11-22 15:35:28 +08:00 |
|
z9hang
|
8414e92bbe
|
用户主页修改为跳转到项目托管平台主页
|
2014-11-22 15:25:51 +08:00 |
|
sw
|
93eb68c252
|
Merge branch 'szzh' into develop
|
2014-11-22 13:54:10 +08:00 |
|
sw
|
62b6572d92
|
111
|
2014-11-22 13:53:40 +08:00 |
|
sw
|
d788e46546
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
2014-11-22 13:52:46 +08:00 |