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

234 Commits

Author SHA1 Message Date
daiao 0b729ad2e0 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-05 17:39:16 +08:00
daiao 2daf1d9c24 评测 2017-09-05 17:38:59 +08:00
cxt 04bc8c4b42 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-05 17:06:28 +08:00
cxt 134cedf3d2 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-05 17:02:19 +08:00
cxt c16b08c63b 取消学生职业认证中的上传图片 2017-09-05 14:46:19 +08:00
cxt ef3c4f1d51 简化统一实训和课堂的专业及课程名称 2017-09-05 11:03:49 +08:00
miss 3b4a9c7821 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-05 09:41:49 +08:00
miss 4b81715054 几个issue的修改完善 2017-09-05 09:40:37 +08:00
daiao d2482b64e1 邮箱注册时企业邮箱无法查看 2017-09-05 09:28:45 +08:00
cxt 9cecf10829 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-04 16:59:03 +08:00
huang 46b3b8085b game、评测统计显示问题 2017-09-04 16:39:36 +08:00
cxt 3d38b61670 教师列表首次点击时未突出显示 2017-09-04 14:21:46 +08:00
miss d59e7b7cea Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-04 08:59:05 +08:00
miss e3b6f9f66f 小笔样式替换 2017-09-04 08:58:28 +08:00
daiao b1354af656 空格问题 2017-09-03 18:09:42 +08:00
daiao 92c091d2e2 TPI测试集空格样式更改 2017-09-03 17:59:48 +08:00
daiao 871f02a40f 上线缺陷修复 2017-09-03 17:37:29 +08:00
daiao d58c776514 TPI预计输出与实际输出空格样式调整 2017-09-03 16:40:32 +08:00
cxt 8254251670 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-01 15:22:10 +08:00
miss 89078e6ff9 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
# Conflicts:
#	app/views/games/_code_actions.html.erb
#	public/javascripts/edu/edu_tpi.js
 2017-09-01 15:11:02 +08:00
miss fa6faad26d 新增单位界面 2017-09-01 15:06:34 +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
miss 63fab43103 issue列表的完成 2017-09-01 14:59:35 +08:00
daiao 77ea22173e @myshixun.shixun.language == "Html" 2017-09-01 09:16:35 +08:00
daiao dfa5a1013e 获取等待时间 2017-08-31 17:16:59 +08:00
daiao 41c5300ecf 评测增加等待人数 2017-08-31 17:08:36 +08:00
cxt 75522ab120 在线课堂删除课程的联动更新：题库新建的tip和适用课程的输入可选列表，题库只显示普通和实训的作业 2017-08-30 14:39:44 +08:00
cxt 13d39379f8 Merge branch 'develop' into dev_cxt 2017-08-30 10:50:43 +08:00
cxt 43eafaf095 新建课堂修删除专业等信息，简洁化 2017-08-29 17:31:28 +08:00
miss 4c25c08ad4 调整 2017-08-29 09:14:14 +08:00
cxt baa512e4d7 作业设置的相关修改 2017-08-28 15:02:54 +08:00
miss eb2b736c45 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-08-28 11:10:44 +08:00
miss 4c0b2fc3a8 实训课程的学习须知，底部间距与头部间距保持一致 ，平台首页的相关tip更换新样式 2017-08-28 11:10:17 +08:00
cxt 1818885424 实训课程改为：实训路径 2017-08-28 09:14:09 +08:00
caishi f482b90cc2 实训点击事件 2017-08-25 21:42:16 +08:00
caishi 55d8fa7f13 Merge branch 'dev_cs' into develop 2017-08-25 21:40:01 +08:00
caishi e60329fc97 Merge branch 'develop' into dev_cs 2017-08-25 21:26:06 +08:00
caishi c4ac37cc4d 双点击事件 2017-08-25 21:19:20 +08:00
miss 78f50d70ca Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-08-25 20:46:10 +08:00
miss c234125ee5 主页tip样式修改。版本库及评测区域图标变换 2017-08-25 20:45:44 +08:00
cxt 1195f09b07 绑定邮箱点击打开新窗口 2017-08-25 20:22:20 +08:00
XuCheng642 d0181f80b7 Merge branch 'dev_xucheng' into develop 2017-08-25 16:25:12 +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 67ce988957 Merge branch 'dev_cs' into dev_cxt 2017-08-25 16:12:06 +08:00
XuCheng642 f54453f32c 管理员界面新增专业 2017-08-25 16:11:35 +08:00
cxt 5bd3e4a185 实训课程的调整 2017-08-25 16:11:21 +08:00
caishi b08d4da7f9 班级作业列表不够1页的高度调整 2017-08-25 15:55:23 +08:00
daiao c87c73d2ee 实训添加合作者报500 2017-08-25 15:29:49 +08:00
cxt 49bbd36c12 实训套件的改版 2017-08-24 20:01:34 +08:00
miss c16936ff4c Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-08-24 16:37:02 +08:00