caishi
/
trustieplus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,875 Commits 24 Branches 0 Tags 0 B
Commit Graph

181 Commits

Author SHA1 Message Date
huang eb457f4774 add migrate 2017-10-14 15:25:07 +08:00
cxt ab4f85565c 实训作业的说明 2017-10-13 21:57:53 +08:00
XuCheng642 667fc4e947 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 20:22:47 +08:00
XuCheng642 fbfa68f843 实训列表页 2017-10-13 20:20:32 +08:00
daiao 9a798f3944 Merge branch 'dev_daiao' into develop 
Conflicts:
	app/views/praise_tread/_edu_praise.html.erb
	app/views/users/show.html.erb
 2017-10-13 18:53:32 +08:00
cxt 10884221b5 测验历史数据的题号迁移 2017-10-12 18:35:55 +08:00
daiao 091ee1e352 各种错误页面（无权限等）的用户反馈，在论坛中的来源文字修改 2017-10-11 17:05:00 +08:00
cxt c69f9c9d9f 课程列表数据混乱，educoder创建的C++程序设计课程有多条记录 2017-10-10 15:59:52 +08:00
daiao 112f350995 帖子回复功能 2017-09-30 21:34:57 +08:00
huang 2ee93c73f6 Merge branch 'dev_new_gitlab_huang' into develop 2017-09-30 16:48:40 +08:00
huang 5032b368f5 数据迁移及发布实训的时候不同步gitlab角色 2017-09-30 16:33:59 +08:00
cxt 91ba070ca8 Merge branch 'dev_cxt' into develop 
Conflicts:
	app/helpers/application_helper.rb
	app/views/messages/_course_show.html.erb
	app/views/student_work/index.html.erb
	public/stylesheets/css/taskstyle.css
 2017-09-30 16:33:07 +08:00
huang 3c19e12081 实训版本库代码同步功能 2017-09-30 10:42:26 +08:00
cxt ad324eb899 迁移文件 2017-09-29 18:20:57 +08:00
XuCheng642 cbb648dd40 自动授权列表 2017-09-29 16:18:41 +08:00
cxt 7aef72d7a3 在线试卷 2017-09-28 16:51:15 +08:00
daiao 5fcb1f18c4 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 20:06:05 +08:00
daiao 0e253c4e9f 实训关卡得分默认值设置为100分，并迁移以往分数为空的数据 2017-09-22 20:05:48 +08:00
huang fddf4b302a Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 20:04:49 +08:00
huang 7cc12f034d 已发布实训版本库控制权限迁移 2017-09-22 20:04:32 +08:00
XuCheng642 60739117c4 课程列表数据库修改 2017-09-22 19:34:22 +08:00
huang 2ac8536575 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 19:05:56 +08:00
huang 759cda61b9 实训复制权限及复制的时候没有复制适用课程 2017-09-22 19:05:37 +08:00
XuCheng642 23550b8923 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	app/controllers/managements_controller.rb
 2017-09-22 18:48:03 +08:00
caishi 78874ff0cc Merge branch 'dev_cs' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	app/helpers/student_work_helper.rb
	app/views/courses/sync_students.js.erb
 2017-09-22 17:12:37 +08:00
daiao f6f3960ba4 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 11:15:47 +08:00
daiao 7570a83142 实训里的反馈，要标明是对哪一关 2017-09-22 11:15:18 +08:00
huang a234bdc01b Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 10:47:41 +08:00
cxt 86e2f60946 Merge branch 'develop' into dev_cxt 
Conflicts:
	app/controllers/shixuns_controller.rb
	app/views/subjects/new.html.erb
	public/javascripts/edu/base_edu.js
 2017-09-21 17:46:58 +08:00
huang 945a3772e6 实训复制完善 2017-09-21 16:50:13 +08:00
daiao 01b8a72e38 选择题tpi中的显示没有按照tpm的排序来显示 2017-09-20 10:29:39 +08:00
cxt c4d786664b 实训路径的标题部分不固定显示“第1章”等字样 2017-09-18 17:36:11 +08:00
daiao a5d986779a 修改选择题题干类型（从string类型，修改为text） 2017-09-18 17:27:49 +08:00
XuCheng642 9791cec004 管理员界面issue解决 2017-09-18 15:38:59 +08:00
huang bfe758be78 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	app/views/challenges/_single_or_multiple_question.html.erb
	app/views/messages/_common_reply_box.html.erb
	app/views/praise_tread/_edu_praise.html.erb
	app/views/student_work/_common_reply_box.html.erb
 2017-09-15 21:13:14 +08:00
daiao 7ac17f10bd Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 19:29:09 +08:00
daiao 550f152e27 单选多选题 2017-09-15 19:28:19 +08:00
XuCheng642 ac28f83271 Merge branch 'develop' into dev_xucheng 
Conflicts:
	app/controllers/managements_controller.rb
	app/helpers/application_helper.rb
	app/views/subjects/_subject_list.html.erb
	config/routes.rb
 2017-09-15 18:35:37 +08:00
huang 3e07f18be5 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 
Conflicts:
	app/views/courses/settings/_all_student_list.html.erb
 2017-09-15 10:55:32 +08:00
daiao ec22bbe0c1 Merge branch 'develop' into dev_daiao 
Conflicts:
	app/controllers/games_controller.rb
	app/views/challenges/edit.html.erb
	app/views/games/_game_show.html.erb
	public/stylesheets/css/edu-common.css
 2017-09-15 09:10:36 +08:00
huang 0f2bb1734f excel解析用户 2017-09-14 19:58:13 +08:00
XuCheng642 d33e79dc86 Merge branch 'develop' into dev_xucheng 
Conflicts:
	app/controllers/managements_controller.rb
 2017-09-14 19:30:36 +08:00
XuCheng642 f9e4385226 问题修改2017 09 11 2017-09-14 19:24:47 +08:00
daiao 2c7e5d1f38 TPI单选多选题 2017-09-14 17:30:58 +08:00
daiao 0a1e895dc2 单选多选题的TPM（初版） 2017-09-12 14:08:19 +08:00
daiao a27f10d884 选择题的新建和详情页面 2017-09-12 09:05:51 +08:00
cxt f457d87755 实训首页的检索 2017-09-08 20:30:25 +08:00
XuCheng642 dca722c5dd Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into dev_xucheng 
Conflicts:
	app/views/syllabuses/index.html.erb
 2017-09-08 19:11:24 +08:00
cxt a376140d75 Merge branch 'dev_cxt' into develop 2017-09-08 15:50:21 +08:00
cxt bfe20231e8 实训作业的评分 2017-09-08 13:04:47 +08:00