 huang
|
da19d8a7fd
|
添加日志
|
2017-05-05 20:57:18 +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 |
 daiao
|
990b0a250c
|
修复上线bug
|
2017-05-05 20:14:26 +08:00 |
|
cxt
|
f2a0287d09
|
新建课程的标签-“智能课堂”
|
2017-05-05 19:48:36 +08:00 |
|
cxt
|
239178e4e1
|
去掉个人首页的“编辑我的资料”、隐藏“博客”
|
2017-05-05 19:45:33 +08:00 |
|
cxt
|
3fdec893c9
|
Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
app/views/layouts/base_edu.html.erb
public/stylesheets/css/edu-public.css
|
2017-05-05 19:37:29 +08:00 |
|
cxt
|
6fe571cc99
|
课程资源库和课程题库
|
2017-05-05 19:36:32 +08:00 |
|
huang
|
44e309dcc0
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-05 17:23:36 +08:00 |
|
huang
|
e06dba1879
|
测试集通过的时候显示对勾，ajax加载图片无法显示问题
|
2017-05-05 17:23:21 +08:00 |
|
daiao
|
d39f9deac3
|
实训tpi代码优化
|
2017-05-05 17:22:50 +08:00 |
|
daiao
|
97400db898
|
实训时间更新
|
2017-05-05 17:12:04 +08:00 |
|
huang
|
9d2907551b
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-05 16:38:26 +08:00 |
|
huang
|
aa080318ee
|
Merge branch 'dev_huang' into develop
|
2017-05-05 16:38:10 +08:00 |
|
huang
|
ead40dda01
|
ajax加载效果
|
2017-05-05 16:37:48 +08:00 |
|
daiao
|
69125fa9c4
|
baiduTemplate在JS文件中报错
|
2017-05-05 16:33:13 +08:00 |
|
huang
|
7f70bad8f1
|
Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
|
2017-05-05 16:14:50 +08:00 |
|
huang
|
6e52d9128b
|
评测显示结果更正。代码重构
|
2017-05-05 16:14:35 +08:00 |
|
daiao
|
5fe19a5d6f
|
TPM的首页，任务列表样式优化
|
2017-05-05 16:02:41 +08:00 |
|
daiao
|
9bf33e4fe3
|
查看答案扣除积分功能
|
2017-05-05 14:57:58 +08:00 |
|
daiao
|
95aa6f3b1b
|
实训列表改版（未完成）
|
2017-05-05 08:55:54 +08:00 |
|
huang
|
ea0d90a383
|
实训积分系统
|
2017-05-04 17:29:00 +08:00 |
|
huang
|
d65e95ba7d
|
解决返回结果为nil时500问题
|
2017-05-04 16:59:40 +08:00 |
|
huang
|
57ede2102f
|
Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
Conflicts:
public/stylesheets/css/edu-common.css
|
2017-05-04 14:48:56 +08:00 |
|
huang
|
ceaef6cf53
|
Merge branch 'develop' into dev_huang
|
2017-05-04 14:47:36 +08:00 |
|
huang
|
add2eeaf04
|
实训查看扣除积分后台处理
|
2017-05-04 14:47:19 +08:00 |
|
cxt
|
5e82ef00ba
|
身份认证
|
2017-05-04 14:33:50 +08:00 |
|
huang
|
086bc73f00
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-04 13:57:03 +08:00 |
|
huang
|
eaed13dbc8
|
积分初始数据迁移
|
2017-05-04 13:56:43 +08:00 |
|
daiao
|
87835eff45
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-04 10:51:15 +08:00 |
|
daiao
|
651e98c408
|
更换平台按钮样式
|
2017-05-04 10:50:59 +08:00 |
|
huang
|
640dd285c1
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-04 10:07:34 +08:00 |
|
huang
|
1b708c2646
|
区分注册的时候邮箱和手机积分
|
2017-05-04 10:07:00 +08:00 |
|
daiao
|
36975ade3e
|
实训版本库设置最小高度600px
|
2017-05-04 09:16:54 +08:00 |
|
daiao
|
660e29fe3d
|
tpm列表
|
2017-05-03 17:46:59 +08:00 |
|
daiao
|
44730cb379
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-03 17:34:49 +08:00 |
|
daiao
|
25449ac0f3
|
实训TPM列表点击进入调整
|
2017-05-03 17:34:33 +08:00 |
|
huang
|
b8e0da5eaa
|
完善资料积分数据迁移
|
2017-05-03 17:08:46 +08:00 |
|
huang
|
ec22329e5f
|
完善资料积分、积分不重复计算
|
2017-05-03 16:51:26 +08:00 |
|
huang
|
6dcb100936
|
邮件激活按钮样式
|
2017-05-03 15:50:39 +08:00 |
|
huang
|
8a7cd59fc8
|
绑定邮箱添加事务处理及积分
|
2017-05-03 15:41:15 +08:00 |
|
huang
|
a6155d31cc
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-03 15:23:25 +08:00 |
|
huang
|
1aee70dc02
|
完成用户注册积分奖励
|
2017-05-03 15:23:01 +08:00 |
|
daiao
|
c29e3dc759
|
实训左侧全部任务图标更换
|
2017-05-03 14:51:45 +08:00 |
|
daiao
|
d2dc293125
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-03 14:29:08 +08:00 |
|
daiao
|
33dc1f8274
|
codemirror只有修改后，10秒才保存，不修改则不保存
|
2017-05-03 14:28:14 +08:00 |
|
huang
|
6c37495135
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-03 14:14:30 +08:00 |
|
huang
|
a2ad6c827e
|
解决编码问题
|
2017-05-03 14:14:05 +08:00 |
|
daiao
|
8a32c46ffe
|
实训tmp根据不同身份列表点击跳转不同
|
2017-05-03 14:02:31 +08:00 |
|
daiao
|
c5c0f3eb7c
|
实训项目列表中，点击某一个实训后，应该在新的浏览器tab中显示
|
2017-05-03 11:15:33 +08:00 |
|
daiao
|
4431ec6c8f
|
点击开始挑战后，也是新弹出一个浏览tab
|
2017-05-03 11:09:00 +08:00 |