 alan
|
972b788687
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
public/stylesheets/application.css
Signed-off-by: alan <547533434@qq.com>
|
2014-11-19 17:30:53 +08:00 |
|
alan
|
b2ce8c78bd
|
<修改资料>页面<课程成员><admin/settings>页面样式修改，注册后页面跳转路由修改
Signed-off-by: alan <547533434@qq.com>
|
2014-11-19 17:25:10 +08:00 |
 sw
|
4917c63298
|
取消作业截至时间的显示
|
2014-11-19 14:35:58 +08:00 |
|
sw
|
82233a4b54
|
修复老师开启匿评、学生匿评提示以及进入学生作业详细信息界面时界面会自动拉下去的BUG
|
2014-11-19 11:28:54 +08:00 |
|
sw
|
f560e9f494
|
1.修改未开启匿评学生界面取消匿评列表界面显示
2.修改未开启匿评学生直接进入众评点赞界面
|
2014-11-19 11:11:28 +08:00 |
 z9hang
|
eeda25add1
|
设置资源公开与私有功能
|
2014-11-19 11:03:23 +08:00 |
|
sw
|
ff185852eb
|
未开启匿评时老师界面取消开启/关闭匿评按钮显示
|
2014-11-19 10:53:22 +08:00 |
|
sw
|
91cb6e29d5
|
数据库增加是否开启匿评字段
新建作业是增加是否开启匿评功能以及相关页面效果显示
修改相关js判断
|
2014-11-19 10:34:36 +08:00 |
|
z9hang
|
0821320dfe
|
tag删除功能完成，翻页样式修改
|
2014-11-19 10:07:49 +08:00 |
|
z9hang
|
a7a6fbcd22
|
课程资源界面修改
|
2014-11-18 18:02:01 +08:00 |
 zhuhao
|
c1361e37b8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-18 17:04:09 +08:00 |
|
zhuhao
|
126c7f558d
|
修改用户信息处控件对齐，新建课程通知提交取消按钮样式统一
|
2014-11-18 17:03:40 +08:00 |
|
sw
|
861dbc854e
|
修复个人动态主页课程连接错误
|
2014-11-18 16:51:19 +08:00 |
|
sw
|
6245b6ba33
|
修改编辑、启动匿评、关闭匿评、提交作业按钮样式
|
2014-11-18 16:47:04 +08:00 |
|
sw
|
6bfbf5bd2b
|
1.增加匿评阶段课程作业列表界面不可提交作业
2.增加匿评关闭阶段可提交作业
|
2014-11-18 16:13:11 +08:00 |
|
sw
|
d0e549fc85
|
增加作业倒计时显示
|
2014-11-18 16:00:04 +08:00 |
|
sw
|
2de2355e5c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-18 15:24:40 +08:00 |
|
sw
|
3ac023e7a5
|
悬浮框增加屏幕绝对定位
问题：貌似IE6不兼容
|
2014-11-18 11:18:00 +08:00 |
moon
|
e0571a888e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-18 10:57:18 +08:00 |
|
moon
|
e359b987e5
|
增加“课程作业”权限提示
|
2014-11-18 10:56:56 +08:00 |
|
sw
|
90f5cd2e60
|
修改缩放html页面时悬浮框位置显示不正确的BUG
|
2014-11-18 10:39:50 +08:00 |
|
sw
|
804b23f0f6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-18 10:29:20 +08:00 |
|
sw
|
3aaf2247dc
|
修改作业右侧悬浮框css、js
|
2014-11-18 10:29:00 +08:00 |
|
z9hang
|
4b5ad833b0
|
课程资源界面各按钮失效问题
|
2014-11-18 10:26:33 +08:00 |
|
sw
|
a167262fc0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-17 17:45:00 +08:00 |
|
z9hang
|
33555e598e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-17 16:21:05 +08:00 |
|
z9hang
|
22696fe4f9
|
#985 micros版：资源搜索，下载资源控件显示错误
|
2014-11-17 16:20:48 +08:00 |
|
moon
|
f21767cb16
|
增加其他角色新建课程权限
|
2014-11-17 16:13:40 +08:00 |
|
moon
|
c086009313
|
国际化
|
2014-11-17 15:48:05 +08:00 |
|
moon
|
34d7208deb
|
课程联系界面
|
2014-11-17 15:21:36 +08:00 |
|
sw
|
80e3e44f13
|
修复学生不能退出私有课程的BUG
|
2014-11-17 15:01:48 +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 |
|
zhuhao
|
3fd1f77535
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-14 16:38:57 +08:00 |
|
zhuhao
|
b1e58f3fd5
|
新增弹框
|
2014-11-14 16:38:14 +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
|
857578dc92
|
修改bug<contest网站的作品提交界面需要改进>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-14 11:15:46 +08:00 |
|
alan
|
a0a028d3d9
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-14 10:54:25 +08:00 |
|
alan
|
e0cf3bd6de
|
修改bug<贴吧换行显示不正确>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-14 10:54:05 +08:00 |
|
zhuhao
|
532e2676a3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-13 16:37:34 +08:00 |
|
zhuhao
|
29343b8ba7
|
修改了显示样式
|
2014-11-13 16:37:08 +08:00 |
|
alan
|
8d3f7bd0bf
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-13 15:55:28 +08:00 |
|
alan
|
a4e659d8e1
|
修改bug<代码评审模块请在左下角显示，不要在tab中显示>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-13 15:55:12 +08:00 |
|
alan
|
879433a9b8
|
Signed-off-by: alan <547533434@qq.com>
|
2014-11-13 11:09:47 +08:00 |
|
z9hang
|
c89f3cf1a3
|
修改回复位置
|
2014-11-13 10:42:29 +08:00 |