 caishi
|
5d3637a25b
|
Merge branch 'develop' into dev_cs
Conflicts:
app/views/courses/index.html.erb
app/views/layouts/_unlogin_header.html.erb
|
2017-07-23 16:56:35 +08:00 |
|
caishi
|
aabec8b8f0
|
一些修改
|
2017-07-23 16:54:26 +08:00 |
 miss
|
e7d07cd366
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-21 21:55:58 +08:00 |
|
miss
|
3e4d4a7ce0
|
拖拽效果的增加
|
2017-07-21 21:50:50 +08:00 |
 daiao
|
06f73b6c82
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/views/courses/index.html.erb
app/views/shixuns/_form.html.erb
|
2017-07-21 10:00:45 +08:00 |
|
caishi
|
21f0be3a26
|
修改的部分Issues，样式问题
|
2017-07-18 11:12:33 +08:00 |
|
caishi
|
d53a607157
|
TPI添加评论Tab
|
2017-07-18 08:45:33 +08:00 |
|
daiao
|
4ce68786b9
|
顶部导航栏恢复上个版本的灰色
|
2017-07-17 16:24:22 +08:00 |
|
caishi
|
06032119fd
|
课程实训首页以及弹框的页面
|
2017-07-11 09:11:42 +08:00 |
|
daiao
|
9c47800348
|
实训tpi页面选中tab时字体颜色改为#bfbfbf，且命令行不应该有白边框和滚动条
|
2017-07-07 21:32:01 +08:00 |
 cxt
|
5ba8c73f1b
|
实训首页的搜索
|
2017-07-07 16:17:45 +08:00 |
|
cxt
|
7b9c59d6e8
|
基础数据加上“专业”、“课程”，实训的适用专业和课程
|
2017-07-06 17:52:59 +08:00 |
|
daiao
|
b6af847a4a
|
实训的“已关闭”是状态，不是按钮，请去除鼠标手和悬浮效果
|
2017-06-30 16:53:08 +08:00 |
|
daiao
|
93349b3484
|
项目实训首页排序文字精简
|
2017-06-29 17:38:10 +08:00 |
|
daiao
|
058b7e1d7d
|
统一确认弹框的公共样式
|
2017-06-28 10:05:23 +08:00 |
|
daiao
|
ff2a509a9f
|
顶部导航栏的调整（背景色和头像）
|
2017-06-27 14:04:08 +08:00 |
|
daiao
|
f59e7952b3
|
实训TPI的全部任务页面，关卡状态显示不够明显
|
2017-06-23 09:56:31 +08:00 |
|
daiao
|
cf73698051
|
实训TPI参考答案与过关任务无法进行复制
|
2017-06-09 17:24:49 +08:00 |
|
daiao
|
6c3b482869
|
样式调整
|
2017-06-09 16:04:04 +08:00 |
|
daiao
|
5c39cd4836
|
实训列表与智慧课堂列表显示调整
|
2017-06-02 20:15:32 +08:00 |
|
daiao
|
9aa4471202
|
智能课堂首页的块状显示信息有误
|
2017-06-02 19:45:45 +08:00 |
 Linda
|
2686afd465
|
智能课堂的首页显示需要调整
|
2017-06-01 17:09:25 +08:00 |
|
Linda
|
23c65d4c57
|
项目实训的块状显示，悬浮在最后一列时，下方的块块会错位
|
2017-06-01 16:28:47 +08:00 |
|
daiao
|
cf3f068fc3
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-25 17:36:15 +08:00 |
|
daiao
|
22d4ea6478
|
样式调整
|
2017-05-25 17:35:59 +08:00 |
|
Linda
|
93f4f3b3c7
|
项目实训 首页的显示调整
|
2017-05-25 16:59:49 +08:00 |
|
daiao
|
46e5fdb8f0
|
平台底部导航栏固定在平台底部
|
2017-05-24 14:51:23 +08:00 |
 huang
|
7ad005d28e
|
合作者提供删除功能
|
2017-05-19 17:14:15 +08:00 |
|
Linda
|
006fec71a7
|
智能课堂的首页，请按照游戏实训优化整体效果
|
2017-05-19 16:04:30 +08:00 |
|
Linda
|
87ceaca558
|
实训项目的统计页显示错乱
|
2017-05-19 15:07:26 +08:00 |
|
daiao
|
e0a4a9b1ab
|
TMP新增预备知识页面，新建/配置加入预备知识MD
|
2017-05-18 11:30:29 +08:00 |
|
daiao
|
08c4c7ee79
|
实训新建页面
|
2017-05-17 17:19:16 +08:00 |
|
daiao
|
6a457698be
|
TMP列表经验值没有对齐
|
2017-05-17 15:13:39 +08:00 |
|
daiao
|
5c8170ffea
|
实训代码区域在右侧最大化
|
2017-05-17 11:16:54 +08:00 |
|
daiao
|
f0e672b584
|
加载中的icon居中
|
2017-05-16 17:22:42 +08:00 |
|
daiao
|
7496e76e15
|
下一步加入“加载中gif”
|
2017-05-14 16:22:02 +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
|
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 |
|
Linda
|
e5ba9d97d3
|
Merge branch 'dev_linda' into develop
|
2017-05-12 09:27:00 +08:00 |
|
Linda
|
f9ac2db6a1
|
实训手机浏览情况下banner不完整修改
|
2017-05-12 09:24:13 +08:00 |
|
daiao
|
78d56c6e2b
|
tmp列表样式修改
|
2017-05-11 16:35:03 +08:00 |
|
daiao
|
f9766617d2
|
实训名称显示2行，超出部分以省略号结尾
|
2017-05-11 10:59:07 +08:00 |
|
daiao
|
d9394d68f2
|
实训tpi样式调整
|
2017-05-11 10:33:03 +08:00 |
|
daiao
|
f491b340a2
|
实训tpi的评测loading效果做成codefight的评测一致
|
2017-05-11 10:26:13 +08:00 |
|
daiao
|
5f0df57f9e
|
实训首页的导师姓名栏请调整为自适应宽度，栏目整体居中，而不是固定宽度
|
2017-05-10 09:45:18 +08:00 |
|
huang
|
3d6098251e
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-08 15:28:57 +08:00 |
|
huang
|
77025d0ae1
|
实训添加重置功能
|
2017-05-08 15:28:35 +08:00 |
|
daiao
|
d1ed52382d
|
实训头部样式调整 + 版本库codemirror的出现2个滚动条
|
2017-05-08 14:02:26 +08:00 |