 huang
|
dc6e5457cd
|
0
|
2017-07-14 21:37:33 +08:00 |
|
huang
|
f178753f56
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-14 20:53:30 +08:00 |
|
huang
|
22a31d9e37
|
Merge branch 'dev_cs' into develop
|
2017-07-14 20:52:29 +08:00 |
 daiao
|
87a9a1fcdf
|
搜索实训图标提示更换
|
2017-07-14 20:52:29 +08:00 |
 caishi
|
ca6f9c2089
|
新建课堂实训页面拖拽部分的bug
班级页面所有模块加阴影
|
2017-07-14 20:50:37 +08:00 |
|
daiao
|
cfb08b18a6
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-14 17:16:45 +08:00 |
|
daiao
|
e3a7907bf8
|
TA的实训已解锁的数据不是取的被访问者的
|
2017-07-14 17:16:30 +08:00 |
 cxt
|
a513ad0b5a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-14 17:03:41 +08:00 |
|
daiao
|
31ced7734e
|
Merge branch 'dev_daiao' into develop
|
2017-07-14 17:03:16 +08:00 |
|
daiao
|
94aaf39e55
|
用户认证
|
2017-07-14 16:50:24 +08:00 |
|
caishi
|
ef44a119c7
|
Merge branch 'develop' into dev_cs
|
2017-07-14 16:02:05 +08:00 |
|
caishi
|
2939c46aad
|
去掉IE input框输入时自带的清除按钮
|
2017-07-14 15:57:52 +08:00 |
|
cxt
|
4068a9e952
|
班级作业从题库选用，都选后导入的是多个同一作业
|
2017-07-14 15:53:26 +08:00 |
|
cxt
|
60eab2a755
|
用户试用被拒绝后，重新申请可以一直申请，且超级管理员审批页面没有收到申请信息、试用授权的审批页面，点击同意后没有刷新
|
2017-07-14 15:41:31 +08:00 |
|
daiao
|
04527d6366
|
Merge branch 'develop' into dev_daiao
|
2017-07-14 15:40:27 +08:00 |
|
daiao
|
1726221c69
|
Merge branch 'dev_cs' into dev_daiao
|
2017-07-14 15:40:11 +08:00 |
|
daiao
|
c7999cb682
|
缺陷修复
|
2017-07-14 15:39:27 +08:00 |
|
caishi
|
a150c1c883
|
修改删除课程的所有资源的弹出框
|
2017-07-14 15:38:58 +08:00 |
|
caishi
|
edf0e68151
|
切换专业的选项时课程部分的更多没有根据数据的数量显示和隐藏
|
2017-07-14 15:05:01 +08:00 |
|
daiao
|
3e4f551283
|
Merge branch 'dev_daiao' into develop
|
2017-07-14 15:04:25 +08:00 |
|
daiao
|
379252f165
|
webssh
|
2017-07-14 15:03:08 +08:00 |
|
cxt
|
460f1b52d3
|
课程的大纲、资源、题库和教师团队不需要纵向滚动条
|
2017-07-14 15:02:22 +08:00 |
|
cxt
|
3263bf36ed
|
新建实训页面输入内容后刷新页面，适用课程的下拉框中没有数据
|
2017-07-14 14:39:13 +08:00 |
|
cxt
|
5d29060d44
|
新建实训页面的适用课程框中显示不能直接删除，只能点击下拉框中的复选框取消显示
|
2017-07-14 14:22:10 +08:00 |
|
cxt
|
900ff5d267
|
课程实训增加悬浮提示
|
2017-07-14 14:13:48 +08:00 |
|
cxt
|
816b839d01
|
测试版的课程实训报500
|
2017-07-14 14:03:14 +08:00 |
|
caishi
|
b2d1097cb3
|
新建实训，选择一个课程但是下面的提示信息没有隐藏
|
2017-07-14 14:02:50 +08:00 |
|
caishi
|
321f736a4b
|
个人主页头部样式修改
|
2017-07-14 13:49:18 +08:00 |
|
cxt
|
951fde3cd9
|
课程实训调整
|
2017-07-14 12:46:12 +08:00 |
|
cxt
|
c77e83be6e
|
Merge branch 'dev_cs' into develop
|
2017-07-14 12:39:10 +08:00 |
|
cxt
|
7242bc73be
|
课程实训首页
|
2017-07-14 12:37:20 +08:00 |
|
caishi
|
07c40aafc4
|
课堂实训编辑页面的排版修改，以及编辑部分拖拽初始化
|
2017-07-14 10:42:27 +08:00 |
|
cxt
|
55e81d9de3
|
Merge branch 'dev_cs' into develop
|
2017-07-14 10:06:26 +08:00 |
|
caishi
|
3ab6a58acf
|
Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs
|
2017-07-14 10:01:54 +08:00 |
|
caishi
|
0ddbd2d81a
|
个人首页顶部样式
|
2017-07-14 10:01:07 +08:00 |
|
cxt
|
cf5e85df73
|
Merge branch 'develop' into dev_cs
Conflicts:
public/stylesheets/css/edu-subject.css
|
2017-07-14 09:59:50 +08:00 |
|
cxt
|
73fabce2bb
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-14 09:58:42 +08:00 |
|
cxt
|
5535bfc62e
|
课程实训的新建编辑
|
2017-07-14 09:58:20 +08:00 |
|
caishi
|
45d9f152d2
|
TA的实训需要加上边框阴影
|
2017-07-14 08:47:04 +08:00 |
|
huang
|
e4dec24e90
|
0
|
2017-07-13 17:32:29 +08:00 |
|
huang
|
c5ebdbde41
|
解决版本库历史记录分页bug（gitlab数据分页不一致的情况下会报错）
|
2017-07-13 17:20:16 +08:00 |
|
caishi
|
9603353722
|
我的主页更换头像处的点击范围需要扩大到整张图片
班级设置：查找学员icon颜色以及鼠标样式
|
2017-07-13 16:51:24 +08:00 |
|
daiao
|
b6c2c6abc3
|
顶部导航栏在所有页面均有，故点击各项入口的处理：请从打开新页变更为刷新本页显示
|
2017-07-13 16:45:52 +08:00 |
|
huang
|
d93bd9388e
|
版本库历史记录分页功能
|
2017-07-13 16:41:30 +08:00 |
|
huang
|
b1e3f14050
|
修复版本库500问题
|
2017-07-13 16:16:12 +08:00 |
|
huang
|
bf0b3c1031
|
TPM版本库添加修改文件对比功能
|
2017-07-13 16:15:46 +08:00 |
|
daiao
|
b5ab5d6ed1
|
完善版本库
|
2017-07-13 16:06:59 +08:00 |
|
daiao
|
b9a43acf31
|
版本库的在线编辑代码，编辑前与编辑后代码缩进换行距离不一致。注意要结合TPI中显示的缩进距离、换行距离，将三者调成一致
|
2017-07-13 16:05:58 +08:00 |
|
daiao
|
ca7d812266
|
Merge branch 'develop' into dev_daiao
|
2017-07-13 15:26:47 +08:00 |
|
huang
|
c6e6a2055a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-13 15:26:26 +08:00 |