Commit Graph

121 Commits

Author SHA1 Message Date
huang f6240f7d59 新建作业的时候填入列表页面 2017-08-27 10:55:46 +08:00
huang 70b28f07bb 管理员界面专业添加新的迁移 2017-08-27 10:34:59 +08:00
huang 29e9c38553 管理员专业迁移 2017-08-27 10:29:50 +08:00
huang 290df45c79 修复迁移500问题 2017-08-25 20:10:11 +08:00
XuCheng642 a3ec46c820 迁移 2017-08-25 19:54:05 +08:00
XuCheng642 a35df4e5e1 专业列表 2017-08-25 17:32:15 +08:00
cxt a944456e57 Merge branch 'dev_cxt' into develop
Conflicts:
	app/views/subjects/_subject_list.html.erb
2017-08-25 16:13:46 +08:00
cxt 49bbd36c12 实训套件的改版 2017-08-24 20:01:34 +08:00
cxt 78f1fd3d1d 增加试用申请的留言功能 2017-08-22 16:27:28 +08:00
cxt b853f4bf16 镜像管理的model创建 2017-08-22 14:38:56 +08:00
huang 1d1b1634f9 实训合作历史数据同步到gitlab 2017-08-18 09:30:25 +08:00
huang 464ee43018 Merge branch 'develop' into dev_kubernete 2017-08-11 19:05:19 +08:00
cxt 9f36b02a11 迁移文件修改 2017-08-11 17:44:51 +08:00
huang 1fee1dd7f9 Merge branch 'develop' into dev_kubernete
Conflicts:
	app/controllers/shixuns_controller.rb
2017-08-11 17:15:39 +08:00
cxt 139a0597d8 Merge branch 'dev_xucheng' into develop
Conflicts:
	app/views/layouts/base_management.html.erb
	app/views/managements/_class_shixuns_list.html.erb
	app/views/managements/_users_authorization_list.html.erb
	app/views/managements/identity_authentication.html.erb
	app/views/managements/shixun_authorization.html.erb
	app/views/managements/subject_authorization.html.erb
	config/routes.rb
	public/javascripts/edu/account.js
	public/javascripts/edu/syllabus.js
2017-08-11 15:20:56 +08:00
XuCheng642 5d202914a6 增加实训适用课程弹框 2017-08-11 15:04:14 +08:00
huang d92d4e8ee7 Merge branch 'develop' into dev_kubernete
Conflicts:
	.idea/dataSources.xml
	app/controllers/shixuns_controller.rb
2017-08-11 14:52:08 +08:00
cxt 2e55fd4a8f 请增加实训和实训套件的隐藏 功能 2017-08-11 14:43:14 +08:00
cxt aecf1ff13c 个人成长记录中心的数据处理 2017-08-10 16:09:21 +08:00
cxt b7ed446397 金币和经验值的记录迁移 2017-08-10 10:18:28 +08:00
huang 80ea495849 output中添加query index字段区分每次评测结果 2017-08-08 14:25:37 +08:00
cxt 19a8b21b67 注册用户的自动留言,全部删掉 2017-08-07 17:00:53 +08:00
cxt c25b584898 实名认证和职业认证 2017-08-04 11:20:28 +08:00
cxt 8f995d7b46 Merge branch 'dev_cxt' into develop 2017-07-28 17:00:27 +08:00
cxt f82b8f0e20 班级讨论区的上线 2017-07-28 16:59:17 +08:00
daiao 643fc6ce6b 预备知识更新数据 2017-07-28 16:27:10 +08:00
huang b4ff730229 创建答题选项 2017-07-21 14:21:10 +08:00
huang caeba91724 完成单选多选新建 2017-07-21 10:30:40 +08:00
huang d5d95e6575 challenge添加区分类型字段 2017-07-21 10:01:43 +08:00
cxt 59808a8f54 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-20 11:15:12 +08:00
cxt 24a3fdc453 个人资料的真实姓名增加“隐藏真实姓名”选项 2017-07-20 11:14:46 +08:00
cxt b86b465a76 TPI的问题反馈更新为“评论”,直接在TPI中显示评论tab 2017-07-19 17:26:22 +08:00
huang a8dee4247b 迁移问题 2017-07-19 14:07:22 +08:00
huang a2f66cf736 迁移500问题 2017-07-19 14:04:09 +08:00
cxt 816e6d605e 基本资料增加“昵称”,个人主页显示“昵称” 2017-07-18 14:47:50 +08:00
cxt b1e3bc8e82 已发布的实训请在数据库中增加适用专业和课程 2017-07-18 09:55:58 +08:00
cxt 9f1ee5e5da first_level_discipline_id 2017-07-18 09:31:56 +08:00
cxt 5535bfc62e 课程实训的新建编辑 2017-07-14 09:58:20 +08:00
cxt 0ebf73860e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	app/views/layouts/_unlogin_header.html.erb
2017-07-13 09:22:26 +08:00
cxt 65a2355730 课程实训 2017-07-13 09:20:25 +08:00
huang 84eb547ca3 开启实训的时候Mysql查询性能优化,快3s 2017-07-12 13:57:50 +08:00
cxt e6a3d8d455 课程实训 2017-07-11 17:16:28 +08:00
cxt 4f3bc9a2e4 Merge branch 'dev_cxt' into develop
Conflicts:
	app/controllers/shixuns_controller.rb
	app/helpers/application_helper.rb
2017-07-07 18:25:44 +08:00
cxt 1f85875f9d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	app/views/courses/index.html.erb
2017-07-07 18:23:20 +08:00
cxt 5ba8c73f1b 实训首页的搜索 2017-07-07 16:17:45 +08:00
cxt 7b9c59d6e8 基础数据加上“专业”、“课程”,实训的适用专业和课程 2017-07-06 17:52:59 +08:00
huang 37556a7933 webssh类型的实训开启的时候添加webssh实训 2017-07-06 10:48:30 +08:00
cxt cebd0c6c77 新建班级中的学分保留一位小数 2017-07-04 16:26:18 +08:00
cxt f6bd9846ec Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-28 15:23:36 +08:00
cxt 5508cedb45 实训作业 2017-06-28 15:23:09 +08:00