 z9hang
|
ad2a4487c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-26 14:54:51 +08:00 |
|
z9hang
|
5a20945e0d
|
选入我得课程列表中添加课程学期的显示
|
2014-11-26 14:54:31 +08:00 |
 sw
|
c2ac26ed61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-25 16:53:16 +08:00 |
|
sw
|
1fee210924
|
1.修改新建、修改作业提交、取消按钮样式
2.修改作业时关联项目会自动清空
|
2014-11-25 16:51:22 +08:00 |
 alan
|
3eddca8c6e
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-25 16:09:38 +08:00 |
|
alan
|
1fb4b81051
|
修改bug<IE老版本tag显示异常>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-25 16:09:13 +08:00 |
|
sw
|
eb3ac06b40
|
Merge branch 'develop' into szzh
|
2014-11-25 16:03:18 +08:00 |
|
sw
|
bb66ef54f6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-25 16:02:22 +08:00 |
|
sw
|
23907c5c01
|
修改课程讨论区按钮样式
|
2014-11-25 16:02:11 +08:00 |
|
z9hang
|
874936a131
|
恢复被还原的代码
|
2014-11-25 16:00:52 +08:00 |
|
sw
|
70f7c73699
|
Merge branch 'szzh' into develop
|
2014-11-25 14:24:51 +08:00 |
|
sw
|
be31444b43
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/tags/_tag.html.erb
|
2014-11-25 14:22:46 +08:00 |
|
sw
|
918cf6c134
|
修改竞赛标签添加时按钮样式
|
2014-11-25 14:17:39 +08:00 |
|
alan
|
760083ad20
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-25 14:17:27 +08:00 |
|
alan
|
ace5b514c6
|
修改bug<测试版--注册登录：成功激活注册的用户后，登录返回资料修改的页面，姓氏、名字还是标识为必填项>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-25 14:17:04 +08:00 |
|
sw
|
a8cdd2b64c
|
修改新建缺陷时按钮的样式
|
2014-11-25 13:57:30 +08:00 |
|
sw
|
fef005d2d3
|
修改搜索用户报错
|
2014-11-25 11:29:09 +08:00 |
|
sw
|
89e5eda397
|
1.修改课程项目编辑讨论区帖子时按钮样式
2.修复修改课程项目编辑讨论区帖子时第一次点击确定失败
|
2014-11-25 10:52:07 +08:00 |
|
sw
|
5bcc76d399
|
修改作业提交项目第一项为请选择
|
2014-11-25 10:35:43 +08:00 |
|
sw
|
3e3d103828
|
1.增加开启匿评之后学生能提交作业
2.修改学生作业编辑和删除样式
|
2014-11-25 10:15:34 +08:00 |
|
sw
|
23da0a6dad
|
修改作业提交项目时默认问空
|
2014-11-25 10:03:56 +08:00 |
|
sw
|
d19bf06da4
|
修改课程添加tagform表单内元素
|
2014-11-25 09:16:22 +08:00 |
|
sw
|
2c135f5e8d
|
修改课程添加标签返回404的BUG
|
2014-11-25 09:12:15 +08:00 |
|
sw
|
b475cd51e7
|
修改作业留言实名回复
|
2014-11-24 18:23:56 +08:00 |
|
sw
|
c95c021289
|
Merge branch 'szzh' into develop
|
2014-11-24 17:13:32 +08:00 |
|
z9hang
|
cb88dd9064
|
添加td_tech_title非空判断
|
2014-11-24 17:12:12 +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 |
|
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 |
|
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 |