Commit Graph

98 Commits

Author SHA1 Message Date
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
cxt 28c5de80e0 实训申请的迁移 2017-06-26 17:08:47 +08:00
huang be17994e7a 添加经验值功能 2017-06-26 14:05:39 +08:00
cxt 9a7ce94d88 实训的迁移 2017-06-23 13:45:48 +08:00
huang 164ac37005 实训的一些修改 2017-06-22 16:21:47 +08:00
huang e07772f20a 解决base64编码空格问题;版本文件初始化 2017-06-21 16:38:50 +08:00
huang f341cd232e challeng创建优化 2017-06-19 17:27:11 +08:00
cxt 1aa0ce78c3 新版题库 2017-06-16 15:18:41 +08:00
cxt 72369ff2fd 班级作业的设置和列表变更 2017-06-14 15:01:44 +08:00
huang 3b57616986 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	public/stylesheets/css/edu-class.css
2017-06-09 16:55:22 +08:00
daiao 6c3b482869 样式调整 2017-06-09 16:04:04 +08:00
huang 87071cacce 认证 2017-06-07 17:39:24 +08:00
huang 32b725e47a 迁移出错问题 2017-06-02 16:44:40 +08:00
cxt 15345d93bd 作品列表的多条件筛选 2017-06-02 14:27:12 +08:00
huang d935388689 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-27 14:21:56 +08:00
huang ed365cf796 添加实训语言及LOGO;实训认证底层框架 2017-05-27 14:21:31 +08:00
daiao b050ebc2e8 班级模块整体功能完善 2017-05-27 10:27:11 +08:00
huang 128e24711d 用户认证底层结构 2017-05-26 11:23:32 +08:00
huang 128d840037 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-23 19:05:19 +08:00
daiao 522a546ec1 班级的模块设置 2017-05-23 16:00:40 +08:00
huang c9593f7d17 实训作业 2017-05-22 21:31:28 +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 5fdef398a5 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt 2017-05-18 15:40:32 +08:00
cxt 45fecb8b8d 新建作业和作业设置 2017-05-18 15:39:53 +08:00