 Linda
|
de42b13240
|
班级设置成员列表改为table格式
|
2017-05-17 11:46:42 +08:00 |
 daiao
|
5c8170ffea
|
实训代码区域在右侧最大化
|
2017-05-17 11:16:54 +08:00 |
|
daiao
|
f0e672b584
|
加载中的icon居中
|
2017-05-16 17:22:42 +08:00 |
|
daiao
|
c5427f519b
|
实训样式调整
|
2017-05-16 16:42:21 +08:00 |
 huang
|
331a41eccd
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-16 15:27:16 +08:00 |
|
huang
|
7fbbafeab5
|
作业列表添加搜索功能及过滤条件
|
2017-05-16 15:26:56 +08:00 |
|
Linda
|
f897104494
|
课程资源库标题和人名颜色修改
|
2017-05-16 14:46:15 +08:00 |
|
Linda
|
7e0a5d8067
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-16 14:06:02 +08:00 |
|
Linda
|
9db43b87bd
|
教师团队添加成员弹框提示修改
|
2017-05-16 14:03:47 +08:00 |
|
huang
|
8bb03b8497
|
作业列表
|
2017-05-16 11:18:45 +08:00 |
|
Linda
|
fc41a5bb0a
|
课程资源库列表底部线条问题
|
2017-05-16 11:17:33 +08:00 |
|
Linda
|
9ab1d307b0
|
个人主页列表背景色变浅
|
2017-05-16 10:58:30 +08:00 |
|
Linda
|
d0b827019a
|
班级设置界面美化
|
2017-05-16 10:39:37 +08:00 |
|
huang
|
6da6840d73
|
修复game列表链接问题
|
2017-05-16 10:19:16 +08:00 |
|
daiao
|
de5cd798a9
|
Merge branch 'develop' into dev_daiao
|
2017-05-16 09:58:07 +08:00 |
|
huang
|
9dcb06b806
|
Merge branch 'develop' into dev_cxt
|
2017-05-16 09:38:52 +08:00 |
|
huang
|
93e868e8fe
|
课程base
|
2017-05-16 09:38:22 +08:00 |
|
daiao
|
26c59270aa
|
主页点击实训或者课程，应该是在新标签页中打开而非直接刷新
|
2017-05-16 09:24:56 +08:00 |
|
daiao
|
fcc269150b
|
智慧课堂首页
|
2017-05-15 17:24:46 +08:00 |
|
huang
|
7bbea5baac
|
去掉注释
|
2017-05-15 17:08:52 +08:00 |
|
huang
|
b48d4298bf
|
tpi中game列表排序问题
|
2017-05-15 17:00:52 +08:00 |
|
daiao
|
f6c760c1cb
|
智慧课堂首页
|
2017-05-15 16:59:26 +08:00 |
|
huang
|
0881526157
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-15 16:38:04 +08:00 |
|
huang
|
f0f8228a91
|
重新评测处理方式修改
|
2017-05-15 16:37:46 +08:00 |
 cxt
|
526d29cbe5
|
Merge branch 'dev_cxt' into develop
|
2017-05-15 10:27:39 +08:00 |
|
cxt
|
09ced7e648
|
Merge branch 'develop' into dev_cxt
|
2017-05-15 10:27:09 +08:00 |
|
cxt
|
c1025f2c49
|
作业新版样式
|
2017-05-15 10:26:11 +08:00 |
|
daiao
|
048a16927e
|
Merge branch 'develop' into dev_daiao
|
2017-05-15 09:13:35 +08:00 |
|
huang
|
5f84ec7d48
|
resubmit参数问题
|
2017-05-14 17:41:34 +08:00 |
|
huang
|
1d229c6075
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-14 16:26:49 +08:00 |
|
daiao
|
dbaed4d6d8
|
Merge branch 'dev_huang' into develop
|
2017-05-14 16:22:51 +08:00 |
|
daiao
|
7496e76e15
|
下一步加入“加载中gif”
|
2017-05-14 16:22:02 +08:00 |
|
huang
|
e46228a025
|
Merge branch 'dev_huang' into develop
|
2017-05-14 15:49:10 +08:00 |
 guange
|
86527953be
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-14 15:39:09 +08:00 |
|
daiao
|
70040f2343
|
Merge branch 'develop' into dev_huang
Conflicts:
app/views/games/_code_actions.html.erb
|
2017-05-14 15:33:45 +08:00 |
|
guange
|
fce131a402
|
头像裁剪上传
|
2017-05-14 15:32:35 +08:00 |
|
daiao
|
75d670e271
|
评测加载中
|
2017-05-14 15:29:29 +08:00 |
|
huang
|
660f23d0fb
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-14 15:28:35 +08:00 |
|
huang
|
fe350546a9
|
重新评测的一些修改
|
2017-05-14 15:28:18 +08:00 |
|
daiao
|
27a65aba53
|
Merge branch 'develop' into dev_huang
|
2017-05-14 11:44:04 +08:00 |
|
daiao
|
5d1afccb7e
|
智慧课堂（未完）
|
2017-05-14 11:21:42 +08:00 |
|
cxt
|
cd977bad3a
|
Merge branch 'dev_cxt' into develop
Conflicts:
public/stylesheets/css/edu-common.css
public/stylesheets/css/taskstyle.css
|
2017-05-13 22:26:14 +08:00 |
|
cxt
|
050a62cc7a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-13 22:24:49 +08:00 |
|
cxt
|
528e08be04
|
Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
|
2017-05-13 22:24:14 +08:00 |
|
cxt
|
0e868b45d7
|
班级新建和设置（除模块设置）
|
2017-05-13 22:23:53 +08:00 |
|
huang
|
c6a140ab3e
|
评测
|
2017-05-12 22:12:34 +08:00 |
|
huang
|
0a4b807a43
|
注释重新评测
|
2017-05-12 21:53:36 +08:00 |
|
huang
|
2d8995b91e
|
已完成关卡显示状态
|
2017-05-12 21:48:06 +08:00 |
 miss
|
b1b061eeaa
|
调整样式及部分结构
|
2017-05-12 21:24:01 +08:00 |
|
huang
|
0da2b863c3
|
实训提交的时候编码问题
|
2017-05-12 21:07:52 +08:00 |