 cxt
|
8f0a0e94f2
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-24 16:28:52 +08:00 |
|
cxt
|
9ca6f450fe
|
作业列表、定时执行任务
|
2017-05-24 16:27:55 +08:00 |
|
cxt
|
55e04d2886
|
作业详情页的回复
|
2017-05-24 10:49:33 +08:00 |
 daiao
|
804be70dd1
|
“我的课堂”的标签请更新为“我的课堂”
|
2017-05-24 09:24:12 +08:00 |
 huang
|
f439587c44
|
智能课堂tab title修改
|
2017-05-23 22:18:45 +08:00 |
|
huang
|
73cd664ba4
|
实训首页tap显示更正
|
2017-05-23 21:35:31 +08:00 |
|
huang
|
7fefef3122
|
平台首页标签改成“高校智能化教学与实训平台”
|
2017-05-23 21:29:47 +08:00 |
|
huang
|
15b86ea78a
|
发布实训错误提示等级封装
|
2017-05-23 20:53:27 +08:00 |
|
huang
|
128d840037
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-23 19:05:19 +08:00 |
 Linda
|
f281017cec
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-23 17:34:25 +08:00 |
|
daiao
|
522a546ec1
|
班级的模块设置
|
2017-05-23 16:00:40 +08:00 |
|
cxt
|
1e8a36a8d2
|
Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
app/views/student_work/show.html.erb
|
2017-05-23 15:32:16 +08:00 |
|
cxt
|
935922b365
|
普通、编程、分组作业的提交和编辑
|
2017-05-23 15:18:53 +08:00 |
|
Linda
|
3933f9a6e3
|
平台首页的智能课堂块，用的icon与智能课堂的首页使用的icon不一致
|
2017-05-23 09:38:25 +08:00 |
|
huang
|
61f2f632ca
|
Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
app/views/homework_common/index.html.erb
app/views/layouts/base_edu.html.erb
|
2017-05-22 11:14:18 +08:00 |
|
cxt
|
f46bd2ac06
|
新版作业
|
2017-05-22 10:29:51 +08:00 |
|
huang
|
9492725fc8
|
challenge链接更新问题
|
2017-05-19 20:36:41 +08:00 |
|
huang
|
aa7bb35cc9
|
个人主页实训tab
|
2017-05-19 10:34:56 +08:00 |
|
huang
|
ed8b14bce1
|
作品列表相关功能补充
|
2017-05-18 19:40:51 +08:00 |
|
cxt
|
b74570f517
|
Merge branch 'develop' into dev_cxt
Conflicts:
app/views/homework_common/index.html.erb
app/views/layouts/base_courses.html.erb
public/stylesheets/css/edu-public.css
|
2017-05-18 15:44:57 +08:00 |
|
cxt
|
45fecb8b8d
|
新建作业和作业设置
|
2017-05-18 15:39:53 +08:00 |
|
huang
|
7fbbafeab5
|
作业列表添加搜索功能及过滤条件
|
2017-05-16 15:26:56 +08:00 |
|
huang
|
8bb03b8497
|
作业列表
|
2017-05-16 11:18:45 +08:00 |
|
cxt
|
cd977bad3a
|
Merge branch 'dev_cxt' into develop
Conflicts:
public/stylesheets/css/edu-common.css
public/stylesheets/css/taskstyle.css
|
2017-05-13 22:26:14 +08:00 |
|
cxt
|
050a62cc7a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-13 22:24:49 +08:00 |
|
cxt
|
0e868b45d7
|
班级新建和设置（除模块设置）
|
2017-05-13 22:23:53 +08:00 |
|
huang
|
628bad95c2
|
实训统计相关
|
2017-05-12 15:12:06 +08:00 |
|
Linda
|
1f08a02f4a
|
edu首页色块位置修改
|
2017-05-12 09:31:57 +08:00 |
|
huang
|
c2ae3f7b78
|
完成个人主页
|
2017-05-11 14:43:12 +08:00 |
|
huang
|
100d7584d8
|
修复注册时积分问题
|
2017-05-11 09:58:38 +08:00 |
|
huang
|
9a2257d406
|
shixun统计未完成部分
|
2017-05-10 12:56:01 +08:00 |
|
huang
|
5ea6c193f6
|
允许实训创建者参加挑战
|
2017-05-08 16:36:08 +08:00 |
|
cxt
|
9e04ed6a2d
|
课程的资源和题库选用到班级
|
2017-05-08 15:26:16 +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
|
f2a0287d09
|
新建课程的标签-“智能课堂”
|
2017-05-05 19:48:36 +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
|
ea0d90a383
|
实训积分系统
|
2017-05-04 17:29:00 +08:00 |
|
cxt
|
5e82ef00ba
|
身份认证
|
2017-05-04 14:33:50 +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
|
c477b634cb
|
实训统计列表
|
2017-05-02 17:18:34 +08:00 |
|
cxt
|
d040c95305
|
个人主页样式调整
|
2017-05-02 09:10:35 +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
|
7fb67fd8bb
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-04-28 10:21:27 +08:00 |
|
huang
|
5da2a7ee59
|
查看关卡权限修改
|
2017-04-28 10:21:02 +08:00 |
|
daiao
|
02547f54fa
|
耗时显示不是实时更新的，只有点击评测按钮后耗时统计才会发生改变
|
2017-04-28 09:51:18 +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 |