 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 |
|
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
|
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
|
9bf33e4fe3
|
查看答案扣除积分功能
|
2017-05-05 14:57:58 +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
|
add2eeaf04
|
实训查看扣除积分后台处理
|
2017-05-04 14:47:19 +08:00 |
|
cxt
|
5e82ef00ba
|
身份认证
|
2017-05-04 14:33:50 +08:00 |
|
huang
|
1b708c2646
|
区分注册的时候邮箱和手机积分
|
2017-05-04 10:07:00 +08:00 |
|
huang
|
ec22329e5f
|
完善资料积分、积分不重复计算
|
2017-05-03 16:51:26 +08:00 |
|
huang
|
8a7cd59fc8
|
绑定邮箱添加事务处理及积分
|
2017-05-03 15:41:15 +08:00 |
|
huang
|
1aee70dc02
|
完成用户注册积分奖励
|
2017-05-03 15:23:01 +08:00 |
|
huang
|
a2ad6c827e
|
解决编码问题
|
2017-05-03 14:14:05 +08:00 |
|
cxt
|
e810d93491
|
课程资源库
|
2017-05-03 10:10:27 +08:00 |
|
huang
|
c477b634cb
|
实训统计列表
|
2017-05-02 17:18:34 +08:00 |
|
cxt
|
d040c95305
|
个人主页样式调整
|
2017-05-02 09:10:35 +08:00 |
|
huang
|
a12dd6f21e
|
防止ajax没获取数据请求被取消
|
2017-04-28 23:35:27 +08:00 |
|
cxt
|
0188d09454
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/views/layouts/new_base.html.erb
public/stylesheets/css/edu-public.css
|
2017-04-28 22:55:45 +08:00 |
|
cxt
|
60d33cf661
|
课程首页（除课程资源库和课程题库）
|
2017-04-28 22:53:34 +08:00 |
|
huang
|
4fc5ddd3b9
|
编码问题
|
2017-04-28 21:18:23 +08:00 |
|
huang
|
11a831df66
|
解决Base64安全编码问题
|
2017-04-28 20:24:33 +08:00 |
|
daiao
|
4620fd6ec0
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-28 18:49:37 +08:00 |
|
daiao
|
e052e59dc6
|
字符编码
|
2017-04-28 18:49:18 +08:00 |
|
huang
|
bd2260aca0
|
文件名异常
|
2017-04-28 17:37:18 +08:00 |
|
daiao
|
cbd91be0d0
|
实训耗时
|
2017-04-28 16:01:38 +08:00 |
|
huang
|
8588fbacf3
|
总得分统计
|
2017-04-28 15:11:11 +08:00 |
|
huang
|
351da6d9cd
|
boolean类型转换成0/1
|
2017-04-28 10:24:40 +08:00 |
|
huang
|
5da2a7ee59
|
查看关卡权限修改
|
2017-04-28 10:21:02 +08:00 |
|
huang
|
293c92c594
|
处理jenkins中间层返回错误信息中带 “+” 问题
|
2017-04-28 09:13:43 +08:00 |
|
huang
|
30507006eb
|
解决中文乱码
|
2017-04-27 17:34:12 +08:00 |
|
huang
|
6d5ecdf70c
|
解决首页无法退出登录的问题
|
2017-04-27 17:05:39 +08:00 |
|
daiao
|
61b46f4aad
|
codeMirror高度，更新实训json字段
|
2017-04-27 16:24:29 +08:00 |
|
cxt
|
e079bfaa6c
|
Merge branch 'dev_huang' into dev_cxt
|
2017-04-27 16:13:07 +08:00 |
|
cxt
|
a69ba56711
|
基本资料的修改
|
2017-04-27 15:53:13 +08:00 |
|
huang
|
01a6f9f894
|
发布修改可运行文件参数
|
2017-04-27 14:33:09 +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
|
651e02b5cb
|
开始实训初始化identifier
|
2017-04-26 16:03:05 +08:00 |
|
huang
|
0ccd6c0d6b
|
添加重新开启功能及弹框
|
2017-04-26 15:37:32 +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 |
|
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
|
2218a63710
|
shixun整型ID转换成8位字符串
|
2017-04-25 17:15:37 +08:00 |