 Linda
|
0629b76705
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-24 17:36:30 +08:00 |
|
Linda
|
7ae8f91446
|
新建作业的页面样式有点问题
|
2017-05-24 15:41:55 +08:00 |
 daiao
|
46e5fdb8f0
|
平台底部导航栏固定在平台底部
|
2017-05-24 14:51:23 +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
|
0931d17c14
|
激活账号提示页的底部按钮样式需要调整
|
2017-05-23 15:41:04 +08:00 |
|
Linda
|
b522988329
|
实训项目的首页头部，请调整按钮位置
|
2017-05-23 15:24:40 +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 |
|
daiao
|
0f488e82e0
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-19 16:45:21 +08:00 |
|
daiao
|
9c801959fb
|
我的主页课堂列表与课程页列表添加切换列表事件
|
2017-05-19 16:44:57 +08:00 |
|
Linda
|
87ceaca558
|
实训项目的统计页显示错乱
|
2017-05-19 15:07:26 +08:00 |
|
Linda
|
d9a91a2963
|
个人主页悬浮课堂列表时，不应该班级和课程名称同时变色
|
2017-05-19 10:33:27 +08:00 |
|
Linda
|
1783520660
|
课程资源库发送样式修改
|
2017-05-18 17:11:49 +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
|
45fecb8b8d
|
新建作业和作业设置
|
2017-05-18 15:39:53 +08:00 |
|
daiao
|
aa0ed21b8c
|
Merge branch 'dev_daiao' into develop
|
2017-05-18 14:26:40 +08:00 |
|
daiao
|
08c4c7ee79
|
实训新建页面
|
2017-05-17 17:19:16 +08:00 |
|
Linda
|
860a20448f
|
课程资源库标题和人名颜色修改
|
2017-05-17 16:09:16 +08:00 |
|
Linda
|
de42b13240
|
班级设置成员列表改为table格式
|
2017-05-17 11:46: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
|
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 |
 miss
|
b1b061eeaa
|
调整样式及部分结构
|
2017-05-12 21:24:01 +08:00 |
|
Linda
|
d78bdfd941
|
公共样式整理
|
2017-05-12 15:35:53 +08:00 |
|
Linda
|
3d1c8221cb
|
课程中公共样式移到common
|
2017-05-12 14:27:32 +08:00 |
|
daiao
|
7295357413
|
平台背景色请更换成讨论定下的淡灰色
|
2017-05-10 09:22:29 +08:00 |
|
huang
|
7a826e3461
|
样式调整
|
2017-05-05 22:50:23 +08:00 |
|
huang
|
77900caac1
|
样式调整
|
2017-05-05 22:37:58 +08:00 |
|
cxt
|
66640b5a14
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/controllers/account_controller.rb
app/views/layouts/base_edu.html.erb
app/views/layouts/login_bigdata.html.erb
public/stylesheets/css/edu-common.css
|
2017-05-05 20:21:15 +08:00 |
|
cxt
|
6fe571cc99
|
课程资源库和课程题库
|
2017-05-05 19:36:32 +08:00 |
|
huang
|
e06dba1879
|
测试集通过的时候显示对勾，ajax加载图片无法显示问题
|
2017-05-05 17:23:21 +08:00 |
|
huang
|
ead40dda01
|
ajax加载效果
|
2017-05-05 16:37:48 +08:00 |
|
huang
|
57ede2102f
|
Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
Conflicts:
public/stylesheets/css/edu-common.css
|
2017-05-04 14:48:56 +08:00 |
|
cxt
|
5e82ef00ba
|
身份认证
|
2017-05-04 14:33:50 +08:00 |
|
daiao
|
651e98c408
|
更换平台按钮样式
|
2017-05-04 10:50:59 +08:00 |
|
huang
|
6dcb100936
|
邮件激活按钮样式
|
2017-05-03 15:50:39 +08:00 |
|
cxt
|
e810d93491
|
课程资源库
|
2017-05-03 10:10:27 +08:00 |
|
daiao
|
d01c5f75c2
|
实训按钮样式调整
|
2017-05-02 17:29:24 +08:00 |
|
cxt
|
8bc63bc046
|
基本资料的页面问题
|
2017-05-02 14:03:45 +08:00 |
|
cxt
|
60d33cf661
|
课程首页（除课程资源库和课程题库）
|
2017-04-28 22:53:34 +08:00 |