Commit Graph

21094 Commits

Author SHA1 Message Date
daiao d2cede6754 html实训 2017-08-04 10:19:41 +08:00
daiao 397e59e5d1 html实训 2017-08-04 09:38:10 +08:00
daiao 244f3d68f7 个人主页关注与粉丝切换tab 2017-08-02 16:45:35 +08:00
daiao 7bed48e3d9 关注和粉丝页面 2017-08-02 16:34:57 +08:00
daiao bf472f1303 关注和粉丝页面 2017-08-02 15:38:39 +08:00
caishi 46b1ca9fbd 关注粉丝页面样式修改 2017-08-02 14:51:43 +08:00
daiao 9991c1244a 用户关注与粉丝列表 2017-08-02 14:24:37 +08:00
daiao 7a889642c4 个人主页关注与粉丝页面 2017-08-02 10:54:39 +08:00
daiao 73875cbd79 选择题tpi页面,评测答题错误时关卡的icon表示正在挑战,应该是解锁状态 2017-07-31 14:40:28 +08:00
daiao 52d1e007a5 修改平台底部导航栏的显示 2017-07-31 13:58:24 +08:00
daiao 41c13b217b Merge branch 'develop' into dev_daiao 2017-07-31 13:54:39 +08:00
daiao 6e1e199079 实训TPM“编程任务”改为“实践任务” 2017-07-31 13:54:10 +08:00
daiao 115a7a31c3 评测 2017-07-28 21:02:55 +08:00
daiao 8830a58050 最后一关评测 2017-07-28 20:57:49 +08:00
daiao 50877bb2c7 测试 2017-07-28 20:36:02 +08:00
daiao c26f3ed61a 多选题 2017-07-28 20:13:25 +08:00
daiao dbd3ed3f18 更新经验值和金币值 2017-07-28 20:01:34 +08:00
cxt 1e0ba96f82 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-28 19:23:41 +08:00
cxt 01ebc0e10b 非老师不可置顶帖子 2017-07-28 19:23:20 +08:00
daiao e48d0c53f4 缺陷修复 2017-07-28 19:18:11 +08:00
daiao 079c9b441d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-28 19:14:52 +08:00
daiao 0e4cb4e613 实训单选多选题缺陷修复 2017-07-28 19:14:29 +08:00
cxt 51c4d8ed23 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-28 17:40:03 +08:00
cxt fcfc426e6a 新留言提醒方式变更 2017-07-28 17:39:50 +08:00
daiao 35338a8575 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-28 17:33:43 +08:00
daiao 494e338cb0 单选多选题宽度调整 2017-07-28 17:33:28 +08:00
huang 33a6b154e6 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-28 17:10:14 +08:00
huang d8bd851597 Merge branch 'dev_xucheng' into develop 2017-07-28 17:09:36 +08:00
miss 466ddd05d2 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-28 17:04:04 +08:00
miss 6093437889 拖拽版面比例的修改。实训列表的tip样式修改 2017-07-28 17:03:12 +08:00
cxt 8f995d7b46 Merge branch 'dev_cxt' into develop 2017-07-28 17:00:27 +08:00
cxt 67d76ccd3a Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-28 17:00:17 +08:00
cxt f82b8f0e20 班级讨论区的上线 2017-07-28 16:59:17 +08:00
caishi 81092b80bc Merge branch 'dev_cs' into develop 2017-07-28 16:56:54 +08:00
daiao d94d2876de Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-28 16:56:08 +08:00
daiao 56ccc6c6b1 评分设置中奖励经验值不正确,tip说明不正确,技能勋章的tip说明也不正确 2017-07-28 16:55:54 +08:00
caishi a506fd76ca 增加icon,修改样式 2017-07-28 16:53:44 +08:00
huang 43f8976e59 以太坊英文修改 2017-07-28 16:48:24 +08:00
daiao c5df06266e 阶段详情加入任务的ICON 2017-07-28 16:35:39 +08:00
daiao 70cef71676 Merge branch 'dev_cs' into develop 2017-07-28 16:30:38 +08:00
daiao 643fc6ce6b 预备知识更新数据 2017-07-28 16:27:10 +08:00
caishi 81b74c879a 选择题样式问题 2017-07-28 16:25:17 +08:00
caishi efc009e74c Merge branch 'develop' into dev_cs 2017-07-28 15:59:58 +08:00
daiao e1280f0689 选择题样式问题 2017-07-28 15:55:54 +08:00
XuCheng642 b5af15e78f 管理员页面搜索 2017-07-28 15:54:27 +08:00
caishi 5e419c22c3 Merge branch 'develop' into dev_cs 2017-07-28 15:50:23 +08:00
caishi ff13216f21 之前隐藏的“查看全部”,重新显示
点击之后,跳转页面,显示全部的人员信息
2017-07-28 15:48:11 +08:00
daiao 1280d9a332 编程题编辑报错 2017-07-28 15:38:58 +08:00
XuCheng642 67dd627a2d 超级管理员清除功能 2017-07-28 15:27:34 +08:00
daiao 804c2ed76a Merge branch 'dev_daiao' into develop
Conflicts:
	app/views/games/_game_show.html.erb
2017-07-28 15:08:46 +08:00