Commit Graph

20963 Commits

Author SHA1 Message Date
miss 75d3b92bac Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-26 15:49:38 +08:00
miss 32b4ba9a5f 拖拽线的优化
拖拽比例的调整
2017-07-26 15:48:09 +08:00
cxt 9b5d50445b Merge branch 'dev_cxt' into develop 2017-07-26 15:23:57 +08:00
cxt 429642a73d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-26 15:23:46 +08:00
cxt 2bf31a635d Merge branch 'dev_cs' into dev_cxt 2017-07-26 15:23:23 +08:00
cxt 182dc3f421 实训申请发布 2017-07-26 15:15:47 +08:00
caishi a8ceb7260b 编辑套件页面样式修改 2017-07-26 15:06:18 +08:00
cxt faff4c1960 Merge branch 'dev_cxt' into dev_cs 2017-07-26 14:43:19 +08:00
cxt 0cab42160c Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 2017-07-26 14:43:05 +08:00
caishi fc7b2b5945 新建实训关卡入口 2017-07-26 14:42:39 +08:00
cxt f1087cb441 实训套件模块的改版 2017-07-26 14:42:20 +08:00
caishi 055296bdf4 Merge branch 'develop' into dev_cs 2017-07-26 14:20:27 +08:00
caishi c71df99869 本关任务添加选择题的显示 2017-07-26 14:19:02 +08:00
miss 9961fcf511 拖拽调整 2017-07-26 14:18:42 +08:00
caishi f0043373e7 新建阶段添加单选多选的设置 2017-07-26 11:18:23 +08:00
daiao 32c3a9ea70 tpi拖动 2017-07-26 11:16:16 +08:00
daiao df36063fe6 webssh 2017-07-26 10:30:47 +08:00
daiao a4050c6da9 TPI拖拽 2017-07-26 10:21:38 +08:00
miss 5b284c8892 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-26 10:08:39 +08:00
miss 37b908771c 拖拽的修改。样式的调整 2017-07-26 10:06:27 +08:00
caishi 8b2885e408 光标位置 2017-07-25 17:29:31 +08:00
daiao a95817383d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-25 16:56:04 +08:00
daiao 607ab2c767 添加日志 2017-07-25 16:55:52 +08:00
huang ee23e79441 添加语言类型 2017-07-25 16:30:40 +08:00
cxt 34d9d7b0c0 Merge branch 'dev_cs' into dev_cxt 2017-07-25 16:16:25 +08:00
cxt aa7a3ca65a Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 2017-07-25 16:16:12 +08:00
caishi 90ee8f7e05 去掉多余代码 2017-07-25 15:57:42 +08:00
caishi 71d59e152a class名错误 2017-07-25 15:56:34 +08:00
cxt 3de55d4ccc Merge branch 'dev_cs' into dev_cxt 2017-07-25 15:54:00 +08:00
cxt 76c2be4785 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 2017-07-25 15:53:34 +08:00
caishi 01c7b359c9 新建、编辑套件页面的修改 2017-07-25 15:49:51 +08:00
cxt 160e1514ca 实训套件新建流程和查看页面布局变更:Step1-增加新建独立页 2017-07-25 15:41:36 +08:00
daiao 7f489c12a7 测试版WEBSSH 2017-07-25 15:05:15 +08:00
daiao aab4a80c62 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-25 15:04:47 +08:00
daiao f53e820774 我已经通过第2关未开启第3关,退出实训后继续实战进入的还是第1关,应该是当前任务第2关吧 2017-07-25 15:04:30 +08:00
cxt 2b5b756357 页面title的调整 2017-07-25 15:04:01 +08:00
cxt c13b1b5ab2 Merge branch 'dev_cs' into dev_cxt 2017-07-25 14:59:40 +08:00
cxt a35dcab16c Merge branch 'develop' into dev_cs 2017-07-25 14:58:57 +08:00
cxt 78a555828b 成员列表的样式调整为table 2017-07-25 11:21:35 +08:00
cxt 30072b553b 在线课堂的搜索提示文字请调整 2017-07-25 10:35:33 +08:00
caishi 2cd6edbcdc 无论用户是否创建了实训,均可以新建实训套件 (新页面) 2017-07-25 09:19:35 +08:00
cxt d4e7e71f4f 实训套件的翻页 2017-07-24 17:29:53 +08:00
daiao 5e9573a9af 实训套件翻页 2017-07-24 17:25:25 +08:00
daiao 010ebf29a2 实训套件创建数据不对 2017-07-24 17:19:25 +08:00
daiao e45f1c1e93 Merge branch 'dev_cs' into develop 2017-07-24 17:08:31 +08:00
caishi d14b5131d7 个人主页样式 2017-07-24 17:07:43 +08:00
daiao f3be8e03be 个人主页调整 2017-07-24 17:02:19 +08:00
cxt a8169c4353 首页班级数据分页不对 2017-07-24 16:54:18 +08:00
caishi 6f84d188c6 Merge branch 'dev_cs' into develop 2017-07-24 16:43:53 +08:00
daiao a199927172 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-24 16:42:59 +08:00