 Linda
|
0629b76705
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-24 17:36:30 +08:00 |
 daiao
|
6628646725
|
测试通过的icon不对
|
2017-05-24 17:30:01 +08:00 |
|
daiao
|
73150a4d2d
|
固定
|
2017-05-24 16:54:24 +08:00 |
|
daiao
|
f49f565c7e
|
底部导航栏固定在底部
|
2017-05-24 16:53:23 +08:00 |
|
daiao
|
5f1f2298b9
|
底部导航固定在底部
|
2017-05-24 16:28:21 +08:00 |
|
daiao
|
10eaae7e37
|
底部导航 固定在底部
|
2017-05-24 15:32:29 +08:00 |
|
daiao
|
46e5fdb8f0
|
平台底部导航栏固定在平台底部
|
2017-05-24 14:51:23 +08:00 |
|
Linda
|
ea395ff91a
|
课程题库的显示信息方式微调
|
2017-05-24 14:36:40 +08:00 |
|
daiao
|
7f6ea50f1e
|
班级的设置页，无需显示班级头部
|
2017-05-23 22:59:02 +08:00 |
 huang
|
8d15bdb4b5
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-23 21:58:41 +08:00 |
|
huang
|
8ea025193d
|
解决刚注册用户头像样式不一致问题
|
2017-05-23 21:58:24 +08:00 |
|
huang
|
9300917494
|
修复新注册用户导航栏显示错误
|
2017-05-23 21:51:42 +08:00 |
|
daiao
|
dd33d59ed5
|
评测超时提示
|
2017-05-23 21:34:28 +08:00 |
|
Linda
|
b0526b50d9
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-23 20:02:40 +08:00 |
|
Linda
|
322ff780a4
|
班级的位置栏和右侧tip显示需要调整
|
2017-05-23 19:53:22 +08:00 |
|
Linda
|
fd03f58b1f
|
班级头部的邀请码可以突出显示
|
2017-05-23 19:46:42 +08:00 |
|
huang
|
128d840037
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-23 19:05:19 +08:00 |
|
Linda
|
f281017cec
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-23 17:34:25 +08:00 |
|
daiao
|
522a546ec1
|
班级的模块设置
|
2017-05-23 16:00:40 +08:00 |
|
Linda
|
142cfb5b59
|
班级头部的中间行的文字信息最好大小一致
|
2017-05-23 10:58:49 +08:00 |
|
huang
|
61f2f632ca
|
Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
app/views/homework_common/index.html.erb
app/views/layouts/base_edu.html.erb
|
2017-05-22 11:14:18 +08:00 |
 cxt
|
f46bd2ac06
|
新版作业
|
2017-05-22 10:29:51 +08:00 |
|
huang
|
2efa4b73f5
|
隐藏实训统计
|
2017-05-19 19:56:54 +08:00 |
|
huang
|
287ddf7115
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-19 16:56:31 +08:00 |
|
huang
|
f88bf9bcdb
|
实训添加合作者功能
|
2017-05-19 16:56:09 +08:00 |
|
daiao
|
3d48973cfc
|
新版身份认证审批
|
2017-05-19 14:46:45 +08:00 |
|
cxt
|
b74570f517
|
Merge branch 'develop' into dev_cxt
Conflicts:
app/views/homework_common/index.html.erb
app/views/layouts/base_courses.html.erb
public/stylesheets/css/edu-public.css
|
2017-05-18 15:44:57 +08:00 |
|
cxt
|
5fdef398a5
|
Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
|
2017-05-18 15:40:32 +08:00 |
|
cxt
|
45fecb8b8d
|
新建作业和作业设置
|
2017-05-18 15:39:53 +08:00 |
|
daiao
|
beb4bf04fc
|
作业列表的tab加入点击事件
|
2017-05-18 15:38:29 +08:00 |
|
daiao
|
aa0ed21b8c
|
Merge branch 'dev_daiao' into develop
|
2017-05-18 14:26:40 +08:00 |
|
daiao
|
e0a4a9b1ab
|
TMP新增预备知识页面，新建/配置加入预备知识MD
|
2017-05-18 11:30:29 +08:00 |
|
daiao
|
d151e08797
|
学员不应该看到“版本库”
|
2017-05-17 14:30:53 +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
|
93e868e8fe
|
课程base
|
2017-05-16 09:38:22 +08:00 |
|
daiao
|
048a16927e
|
Merge branch 'develop' into dev_daiao
|
2017-05-15 09:13:35 +08:00 |
 guange
|
fce131a402
|
头像裁剪上传
|
2017-05-14 15:32:35 +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
|
0e868b45d7
|
班级新建和设置（除模块设置）
|
2017-05-13 22:23:53 +08:00 |
|
daiao
|
7c3e55b7bd
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-12 15:34:03 +08:00 |
|
daiao
|
95f6ff833a
|
智慧课堂首页（未完）
|
2017-05-12 15:33:44 +08:00 |
|
huang
|
628bad95c2
|
实训统计相关
|
2017-05-12 15:12:06 +08:00 |
|
huang
|
bdf144eed4
|
tpi css加载简化
|
2017-05-11 15:19:28 +08:00 |
|
huang
|
c2ae3f7b78
|
完成个人主页
|
2017-05-11 14:43:12 +08:00 |
|
daiao
|
f491b340a2
|
实训tpi的评测loading效果做成codefight的评测一致
|
2017-05-11 10:26:13 +08:00 |
|
daiao
|
76717343b1
|
顶部导航栏的头像是悬浮显示菜单，请去除多余下拉三角形并将待办任务换成我的留言
|
2017-05-10 10:53:57 +08:00 |
|
daiao
|
d0c28fe182
|
顶部导航栏的下拉选项在点击其他区域后，无法自动隐藏
|
2017-05-10 10:33:33 +08:00 |