 cxt
|
f7cb691c0f
|
申请发布按钮问题
|
2017-06-28 17:24:11 +08:00 |
|
cxt
|
f6bd9846ec
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-28 15:23:36 +08:00 |
|
cxt
|
83bc0cd443
|
已经身份认证的用户，基本资料页的相关项应该禁止修改
|
2017-06-27 10:43:49 +08:00 |
 daiao
|
700063fbac
|
顶部导航栏和课堂首页的文字变更
|
2017-06-26 11:07:05 +08:00 |
|
cxt
|
7dee11fe66
|
实训的流程更改
|
2017-06-21 17:26:49 +08:00 |
|
daiao
|
4584276cbd
|
Merge branch 'dev_daiao' into develop
|
2017-06-16 15:33:31 +08:00 |
|
daiao
|
b000a6ab77
|
editormd加入行内公式与多行公式。修复部分latex公式报错问题
|
2017-06-16 15:27:42 +08:00 |
|
cxt
|
72369ff2fd
|
班级作业的设置和列表变更
|
2017-06-14 15:01:44 +08:00 |
|
cxt
|
e8ad9326ea
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-09 21:01:41 +08:00 |
|
cxt
|
6d9d66d2d5
|
在作业详情页面中多层回复的点赞回复操作应该隐藏，只有鼠标移动上去时才出现，效果见班级动态的回复
|
2017-06-09 18:09:31 +08:00 |
 huang
|
aaf1135e35
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
public/stylesheets/css/edu-common.css
|
2017-06-07 17:43:52 +08:00 |
|
cxt
|
25c0c9cab7
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-07 16:19:48 +08:00 |
|
huang
|
db35db4378
|
身份认证
|
2017-06-06 17:38:10 +08:00 |
 Linda
|
435b291935
|
按照尹老师的意思是，换成2行，降低头部框子的整体高度
|
2017-06-06 14:43:04 +08:00 |
|
cxt
|
ee536468f3
|
作业页面新建作业，没有选择类别就进行确定，给出的提示做一行显示在作业类别上方
|
2017-06-06 11:07:06 +08:00 |
|
daiao
|
6ceab2bb1d
|
作业列表数据为空时的文字显示太靠底边框
|
2017-06-02 15:14:14 +08:00 |
|
daiao
|
d70daee85d
|
主页的快速入口为空时标题栏显示样式调整
|
2017-06-02 14:34:27 +08:00 |
|
huang
|
dd43165ade
|
修复鼠标记过图像后一样的代码显示不同效果的问题
|
2017-06-02 09:30:24 +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 |
|
cxt
|
6b7886e041
|
课程教师团队的双击删除和添加提示请移至列表外
|
2017-05-25 09:55:22 +08:00 |
|
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 |