Commit Graph

339 Commits

Author SHA1 Message Date
cxt 6fe571cc99 课程资源库和课程题库 2017-05-05 19:36:32 +08:00
cxt 5e82ef00ba 身份认证 2017-05-04 14:33:50 +08:00
cxt 4d98c5fc52 我的主页和TA的主页,鼠标悬浮博客块的时候,博客标题没有变色 2017-05-03 10:25:01 +08:00
cxt 0827a0fc48 TA的主页,浏览数量应该与我的主页一样弱化 2017-05-03 10:13:33 +08:00
cxt e810d93491 课程资源库 2017-05-03 10:10:27 +08:00
cxt f7fd1dc5ba 基本资料样式调整 2017-05-02 16:12:45 +08:00
cxt 38cae8fd6f 个人主页“发布博客”没有上下居中 2017-05-02 15:58:40 +08:00
cxt 8bc63bc046 基本资料的页面问题 2017-05-02 14:03:45 +08:00
cxt f1c17c14e5 课程:添加成员和更换管理员的弹框调整 2017-05-02 11:23:45 +08:00
cxt 60d33cf661 课程首页(除课程资源库和课程题库) 2017-04-28 22:53:34 +08:00
cxt e079bfaa6c Merge branch 'dev_huang' into dev_cxt 2017-04-27 16:13:07 +08:00
cxt c49ddaf5f7 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
	app/views/users/show.html.erb
2017-04-27 15:56:17 +08:00
cxt a69ba56711 基本资料的修改 2017-04-27 15:53:13 +08:00
daiao b039bbeb52 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-27 14:37:25 +08:00
daiao b184f927f1 退出实训到实训主页 2017-04-27 14:36:48 +08:00
huang d5ea4ea4de Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-27 14:33:38 +08:00
huang 01a6f9f894 发布修改可运行文件参数 2017-04-27 14:33:09 +08:00
daiao 25648fdfbf 意见反馈成功后,给出提示 2017-04-27 14:27:25 +08:00
huang 4011491fb7 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-27 14:19:07 +08:00
huang 6197699b7c 添加新版ajax效果 2017-04-27 14:18:47 +08:00
daiao 6f19ca9f9b 点击“开始挑战”后,进入等待时,要有一个弹框显示“正在加载实训项目,请稍等… …” 2017-04-27 14:03:04 +08:00
daiao 2ff9aea601 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-27 11:25:46 +08:00
daiao 9e3861af90 实训TPM开始挑战,字体调整为14px 2017-04-27 11:25:20 +08:00
huang a17a1f8910 添加执行文件选项 2017-04-27 11:21:47 +08:00
huang 18543c87ca 实训首页添加reduce排序 2017-04-27 10:18:15 +08:00
huang 61e7ccb4de shixun 排序 2017-04-26 18:03:48 +08:00
huang 2d87bfb2ae 实训的一些修改 2017-04-26 17:01:25 +08:00
huang 00daf38d76 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-26 16:03:21 +08:00
huang 651e02b5cb 开始实训初始化identifier 2017-04-26 16:03:05 +08:00
daiao ec2e2461b8 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-26 15:50:39 +08:00
daiao 9688df346b 实训TMP,技能与知识点点击添加时,自动清空上次的输入的记录,并聚焦 2017-04-26 15:50:22 +08:00
huang 0ccd6c0d6b 添加重新开启功能及弹框 2017-04-26 15:37:32 +08:00
daiao a1684e1392 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-26 15:20:52 +08:00
daiao 33c701490e 当在代码框的底部编写代码时,回车换行后代码框没有自动下移,必须手动滚动才能使当前正在输入代码所在行回到视线 2017-04-26 15:20:32 +08:00
huang 42eb8506c6 shixun编辑中添加sql类型 2017-04-26 15:02:12 +08:00
huang 4d30251bf3 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-26 14:20:26 +08:00
huang b3c803341f url重定义 2017-04-26 14:20:07 +08:00
daiao 2f14a2e6ca Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-26 11:10:20 +08:00
daiao fe9ebbb6d6 实训首页的热度排序与时间排序 2017-04-26 11:10:01 +08:00
huang c98d8cdf1d myshixun中id转换 2017-04-26 10:19:04 +08:00
miss 37c9e2494a 滚动条和回到顶部按钮的修改 2017-04-26 10:15:21 +08:00
huang 02d5287449 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-04-26 09:49:33 +08:00
huang a29b8d7761 顶部导航添加实训游戏入口 2017-04-26 09:49:16 +08:00
daiao 94b7a89e7b Merge branch 'develop' into dev_huang
Conflicts:
	app/views/challenges/_content_list.html.erb
	app/views/shixuns/index.html.erb
2017-04-26 09:48:13 +08:00
huang bf5416fe4b 添加identifier 2017-04-26 09:39:27 +08:00
daiao 466341eed7 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-04-26 09:36:28 +08:00
daiao d69fcefcf5 实训首页,时间与热度排序 2017-04-26 09:36:10 +08:00
miss c3c1fd7ae7 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
	app/views/users/show.html.erb
2017-04-26 09:17:39 +08:00
Linda b98fa0d0f2 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-04-26 09:05:24 +08:00
Linda 4512508e2c 滚动条改方角 2017-04-26 09:04:44 +08:00