Hjqreturn
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,449 Commits 2 Branches 0 Tags 163 MiB
Commit Graph

234 Commits

Author SHA1 Message Date
daiao bfd4ee86ec 一级回复与点赞功能 2017-09-28 15:28:03 +08:00
daiao 71e7725e5c 贴吧 2017-09-26 08:40:27 +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
XuCheng642 ad993b64d1 管理员界面消息列表 2017-09-21 20:59:39 +08:00
huang 66ef740235 复制注释 2017-09-19 17:25:03 +08:00
cxt 3d0f1839a7 Merge branch 'dev_cs' 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:05:56 +08:00
cxt a69dc16af5 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 
Conflicts:
	app/views/courses/settings/_all_student_list_block.html.erb
 2017-09-15 21:02:10 +08:00
cxt d2d388972a 班级页面的分班 2017-09-15 20:59:35 +08:00
caishi c2dec1bddc Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 2017-09-15 20:12:52 +08:00
huang 730e8264c0 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 
Conflicts:
	app/controllers/courses_controller.rb
	app/views/courses/settings/_all_student_list.html.erb
 2017-09-15 19:09:31 +08:00
huang d713ce6de0 批量导入Excel文件到课程列表 2017-09-15 19:03:36 +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
caishi 2f52d3456e Merge branch 'dev_daiao' into dev_cs 2017-09-15 18:29:34 +08:00
miss ac2af05d28 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 18:13:14 +08:00
cxt 508139c57c 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 15:12:09 +08:00
cxt 6469fc1563 课堂的调整 2017-09-15 15:10:35 +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
huang 63cd1ba6ab 新 2017-09-15 10:50:05 +08:00
daiao 0204232e49 导出excel 2017-09-15 10:39:07 +08:00
caishi efd402bed5 Merge branch 'dev_daiao' into dev_cs 
Conflicts:
	app/views/challenges/edit.html.erb
	public/stylesheets/css/edu-common.css
 2017-09-15 09:29:42 +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
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
cxt 86f6bbcac8 课堂相关调整 2017-09-14 14:48:04 +08:00
miss 7ddaa7a9ee tab公共样式的替换 2017-09-14 09:55:28 +08:00
huang 604a5cf75a excel解析批量导入 2017-09-13 17:16:09 +08:00
cxt c205c373a3 Merge branch 'develop' into dev_cs 
Conflicts:
	app/controllers/shixuns_controller.rb
	app/views/challenges/edit.html.erb
	app/views/layouts/base_edu_course.html.erb
	app/views/shixuns/_shixun_top.html.erb
	app/views/shixuns/search_user_courses.js.erb
	public/stylesheets/css/edu-common.css
 2017-09-13 16:19:33 +08:00
daiao 32eaaef9fc 新版实训TPM单选多选题 2017-09-12 16:22:52 +08:00
daiao 0a1e895dc2 单选多选题的TPM（初版） 2017-09-12 14:08:19 +08:00
daiao a27f10d884 选择题的新建和详情页面 2017-09-12 09:05:51 +08:00
XuCheng642 b769ab9fc6 Merge branch 'dev_xucheng' into develop 
Conflicts:
	public/stylesheets/css/edu-common.css
 2017-09-08 19:20:14 +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
daiao 93ad5e97fb Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 19:02:55 +08:00
XuCheng642 c2f09a4989 issue修改 2017-09-08 18:35:45 +08:00
cxt d6ae24539b 忘记密码的邮件标题错误 2017-09-08 17:14:08 +08:00
daiao df1e8988b3 实训发送至功能 2017-09-08 17:05:07 +08:00
daiao 0bc86d9bd7 实训TPI的评测按钮区域新增“上一关” 2017-09-08 11:21:08 +08:00
cxt 3c79e6fc4e Merge branch 'dev_cxt' into dev_cs 
Conflicts:
	app/views/challenges/edit.html.erb
	app/views/shixuns/_send_shixuns.html.erb
	app/views/shixuns/_shixun_top.html.erb
	public/stylesheets/css/edu-common.css
 2017-09-07 16:23:11 +08:00
caishi 659a7b3ef5 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 2017-09-07 14:19:36 +08:00
caishi 359e041186 课堂动态和作业列表样式更新 2017-09-07 14:18:48 +08:00
daiao d67edced16 单选多选题 2017-09-07 09:42:12 +08:00
daiao 9c36affeec 单选多选题 2017-09-06 14:42:31 +08:00
XuCheng642 d8974ef184 issue修改 2017-09-06 09:26:19 +08:00
cxt 4bb1498322 实训的发送至 2017-09-05 17:01:28 +08:00
XuCheng642 ed8a1e4510 Merge branch 'dev_xucheng' into develop 
Conflicts:
	app/controllers/managements_controller.rb
	app/views/courses/new.html.erb
	app/views/users/show.html.erb
	config/routes.rb
 2017-09-01 19:44:19 +08:00
XuCheng642 bb9fb39396 缺陷修复 2017-09-01 19:37:09 +08:00
cxt a087cc809a Merge branch 'dev_cxt' into develop 
Conflicts:
	app/views/courses/index.html.erb
	app/views/courses/index.js.erb
	app/views/subjects/_subject_list.html.erb
	app/views/subjects/show.html.erb
 2017-09-01 15:06:18 +08:00
daiao 77ea22173e @myshixun.shixun.language == "Html" 2017-09-01 09:16:35 +08:00
cxt 43eafaf095 新建课堂修删除专业等信息，简洁化 2017-08-29 17:31:28 +08:00
daiao dde055fd3a 实训TPI提示等待时间信息 2017-08-29 17:07:11 +08:00