zhuhao
|
ebc66af3b5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-03 11:06:13 +08:00 |
zhuhao
|
ebed04c7bf
|
创客空间左侧公共页被拉伸导致出现滚动条的调整
|
2014-12-03 11:05:52 +08:00 |
sw
|
5bd8cc76f4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-02 08:46:23 +08:00 |
zhuhao
|
a7d7b790d2
|
公共页个性签名的提交按钮显示调整
|
2014-12-01 20:26:21 +08:00 |
sw
|
6fd68806d5
|
修改课程教师就具有开启、关闭匿评、修改作业的权限
|
2014-12-01 16:45:03 +08:00 |
sw
|
7fa8d2fff8
|
修改竞赛模块标题栏
|
2014-11-27 17:05:53 +08:00 |
sw
|
cd3f4ef8d3
|
修改标签的显示js
|
2014-11-27 16:44:14 +08:00 |
sw
|
d073cca712
|
修改作业列表相关界面样式
|
2014-11-26 15:24:41 +08:00 |
sw
|
6f0e18f3a6
|
修改竞赛相关模块的标题栏信息
|
2014-11-26 14:49:55 +08:00 |
sw
|
54ffd59eaf
|
修改作业、项目、用户base的主页链接
|
2014-11-26 14:46:08 +08:00 |
sw
|
ff93a62685
|
修改课程,竞赛layout中主页连接。
修改页面显示样式
优化代码
|
2014-11-26 11:44:39 +08:00 |
sw
|
851ef240c1
|
修改页面代码
|
2014-11-26 10:57:53 +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 |
z9hang
|
cb88dd9064
|
添加td_tech_title非空判断
|
2014-11-24 17:12:12 +08:00 |
sw
|
198e2f24ae
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 17:04:40 +08:00 |
alan
|
6363208781
|
修改base_user
Signed-off-by: alan <547533434@qq.com>
|
2014-11-24 15:29:19 +08:00 |
sw
|
adf75d2e8a
|
修改匿评结束显示样式
|
2014-11-24 15:00:20 +08:00 |
sw
|
ca7b56cbf0
|
修改当作业提交大于等于2份时才显示开启匿评按钮
|
2014-11-22 15:56:42 +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 |
sw
|
287e9151a2
|
如果课程没有附件,取消显示附件列表
|
2014-11-22 12:43:42 +08:00 |
sw
|
9908a7f41f
|
修改作业左侧启动匿评按钮样式
|
2014-11-22 12:40:53 +08:00 |
sw
|
a95a68caec
|
增加课程右侧js悬浮框
|
2014-11-22 10:46:15 +08:00 |
moon
|
600afdc6e0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-21 17:00:14 +08:00 |
moon
|
e4e4c94d53
|
封掉所有列表入口,及页面中更多入口
|
2014-11-21 16:59:58 +08:00 |
sw
|
f9b3cc6588
|
Merge branch 'szzh' into CouerseResources
Conflicts:
db/schema.rb
|
2014-11-21 11:41:38 +08:00 |
sw
|
eb15db64ee
|
美化项目工具栏样式显示
修复当缺陷列表为空时缺陷列表样式显示异常
|
2014-11-20 11:16:58 +08:00 |
sw
|
14da0c7d73
|
优化base_head代码
|
2014-11-20 09:15:29 +08:00 |
sw
|
5c4a9ac1f8
|
修改右上角课程的域名
|
2014-11-19 17:45:13 +08:00 |
sw
|
82233a4b54
|
修复老师开启匿评、学生匿评提示以及进入学生作业详细信息界面时界面会自动拉下去的BUG
|
2014-11-19 11:28:54 +08:00 |
sw
|
ff185852eb
|
未开启匿评时老师界面取消开启/关闭匿评按钮显示
|
2014-11-19 10:53:22 +08:00 |
z9hang
|
a7a6fbcd22
|
课程资源界面修改
|
2014-11-18 18:02:01 +08:00 |
sw
|
aa0f10e9fd
|
修改课程通知页面访问报404
|
2014-11-17 11:34:53 +08:00 |
sw
|
c74b5d7bb4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-17 10:33:01 +08:00 |
sw
|
63a141a75a
|
1.修改右上侧课程作业快捷栏显示js、css
|
2014-11-17 10:32:33 +08:00 |
z9hang
|
46e97b7ae4
|
删除多出来的页脚
|
2014-11-17 10:31:48 +08:00 |
z9hang
|
096b0e271f
|
课程页面页脚偏移问题
|
2014-11-17 09:54:21 +08:00 |
z9hang
|
ae19532601
|
修改帮助的浮动边框
|
2014-11-14 17:35:07 +08:00 |
sw
|
512f16a036
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-14 15:04:53 +08:00 |
sw
|
61c8feac8f
|
课程后增加课程作业的快捷栏
|
2014-11-14 15:04:35 +08:00 |
alan
|
b7a89d6108
|
Merge branch 'shaproup' into szzh
Conflicts:
app/models/course.rb
app/models/project.rb
app/views/contests/show_attendingcontest.html.erb
app/views/files/_course_file.html.erb
app/views/files/_course_new.html.erb
app/views/layouts/_base_footer.html.erb
Signed-off-by: alan <547533434@qq.com>
|
2014-11-13 09:59:20 +08:00 |
sw
|
56cc2a7ad3
|
修复老师编辑作业时课程作业tab没有高亮显示
|
2014-11-12 17:07:27 +08:00 |
sw
|
a24d1493f9
|
1.修复点击课程动态,课程动态tab页不高亮显示
2.修复点击新建作业,课程作业tab页不高亮显示
|
2014-11-12 16:51:07 +08:00 |
alan
|
ad6b32ff50
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-11 17:01:29 +08:00 |
sw
|
e3d735ecfc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-11 08:48:27 +08:00 |
alan
|
421d47a687
|
注册的优化
Signed-off-by: alan <547533434@qq.com>
|
2014-11-10 16:08:41 +08:00 |
alan
|
1468f4a8df
|
修改《修改资料》页面
Signed-off-by: alan <547533434@qq.com>
|
2014-11-10 08:58:38 +08:00 |
sw
|
460ba55dde
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/models/user.rb
app/views/courses/_course_form.html.erb
db/schema.rb
|
2014-11-08 16:40:36 +08:00 |
sw
|
ffaa9c51ba
|
修复作业列表报错
修复2个关闭按钮
|
2014-11-07 10:39:17 +08:00 |
sw
|
759d69892e
|
修改弹出框样式
|
2014-11-07 10:37:10 +08:00 |