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

364 Commits

Author SHA1 Message Date
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
cxt 8cf4d0d49c Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-01 14:59:25 +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 406778632a 手机找回密码去掉滑块 2017-08-31 16:24:51 +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
daiao ef0da2ebf6 修改上传附件删除按钮的位置 2017-08-25 19:56:17 +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
miss af72500077 成长中心的“技能标签”tab隐藏 
webssh的部分兼容问题
 2017-08-24 16:36:31 +08:00
daiao 123c0e57f8 没有评测通过时点击重新加载，中间的加载效果一直有 2017-08-24 10:35:42 +08:00
daiao 8111d82435 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-08-24 09:17:03 +08:00
daiao b0b6aa06e6 平台关于附件删除icon的显示需要统一调整 2017-08-24 09:16:43 +08:00
miss 404098149e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
# Conflicts:
#	app/views/games/_repository.html.erb
 2017-08-23 15:20:51 +08:00
miss 6ccd257f5a 缺省的测试区域不正常（360兼容问题） 
tip颜色的修改
 2017-08-23 15:02:04 +08:00
daiao e9f303b248 html渲染使用Iframes 2017-08-23 10:52:19 +08:00
daiao e9b7a98aba Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-08-23 09:42:57 +08:00
daiao f1c0b688a0 邮箱注册后没有激活，重新登录后跳到邮箱激活页面，点击帮助中心跳转500 2017-08-23 09:42:39 +08:00
XuCheng642 ce362108f5 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-08-23 09:25:00 +08:00
XuCheng642 bf01c1b4a8 issue的修改 2017-08-23 09:24:32 +08:00
cxt 696545889b Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-08-22 16:27:41 +08:00
cxt 78f1fd3d1d 增加试用申请的留言功能 2017-08-22 16:27:28 +08:00
daiao 55a1367b8a 新建和编辑关卡的时候，点击代码库弹框后，页面被滚动置顶部了 2017-08-22 16:11:56 +08:00
miss 720b138631 平台tip的进一步优化，解决加载之后的tip事件不执行 2017-08-22 14:17:47 +08:00
miss 78c5b28227 IE浏览器webssh多个tabde的高度问题 2017-08-22 10:21:05 +08:00
daiao e76d058149 载入中样式调整 2017-08-18 20:26:32 +08:00
caishi a5124c9952 TPI加载效果 2017-08-18 16:21:32 +08:00
daiao 1ddac249e2 Merge branch 'dev_TPI' into develop 
Conflicts:
	public/stylesheets/css/edu-common.css
	public/stylesheets/css/taskstyle.css
 2017-08-18 14:03:05 +08:00
cxt f25324e23d Merge branch 'dev_cxt' into develop 2017-08-18 14:00:11 +08:00
caishi 4ecca2df04 Merge branch 'dev_cs' into develop 2017-08-18 13:59:12 +08:00
daiao 43df4f1a5d webssh根据屏幕高度自适应 2017-08-18 09:26:41 +08:00
miss bd08eee523 平台Tip样式的更换 2017-08-17 17:33:38 +08:00
daiao d9628aaac4 tpi优化缺陷调整 2017-08-17 16:09:44 +08:00
daiao bac84938b4 webssh连接增加行数 2017-08-17 14:46:08 +08:00
daiao da1e4c2b5d Merge branch 'develop' into dev_TPI 
Conflicts:
	app/controllers/games_controller.rb
	app/controllers/shixuns_controller.rb
	app/views/games/_code_actions.html.erb
	app/views/games/_repository.html.erb
	public/javascripts/application.js
	public/stylesheets/css/taskstyle.css
 2017-08-17 14:42:26 +08:00
cxt ecfee445c3 复选框列表在翻页后原来页的选择被丢掉了 2017-08-16 17:34:25 +08:00
daiao 6ecea224f1 评测样式调整 2017-08-16 11:23:22 +08:00
miss e5e56bf8a3 加载样式修改 2017-08-16 11:06:55 +08:00
daiao 1c6cfe72d0 实训点击加载中效果 2017-08-16 10:34:25 +08:00
miss eabdc8c8cc 样式修改 2017-08-16 08:56:49 +08:00
caishi 49d5d648c3 在线课堂的首页加入课堂和新建入口的间隔调整 
课程页面显示效果调整存在缺陷
 2017-08-15 09:20:46 +08:00
caishi a8378ebc2f Merge branch 'dev_cs' into develop 2017-08-11 21:00:16 +08:00
caishi d29910ee9a 加载效果的显示 2017-08-11 20:43:33 +08:00
caishi 5bb9e70f57 Merge branch 'dev_cs' into develop 2017-08-11 19:26:41 +08:00
caishi 0b2cbb0c9a 继续实战的加载效果 2017-08-11 19:25:07 +08:00
miss 1aacb457e7 加载修改 2017-08-11 19:02:52 +08:00
cxt c85db2fd5a Merge branch 'dev_cs' into develop 2017-08-11 17:23:27 +08:00
caishi d5a0492914 新增加载等待的样式 2017-08-11 17:21:42 +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
daiao a2792a6fda tpi的JS功能优化 2017-08-11 15:07:45 +08:00
XuCheng642 d3a67b42b2 超级管理员相关页面 2017-08-11 11:27:04 +08:00
miss 38fc425b77 Merge branch 'dev_TPI' of https://bdgit.trustie.net/hushasha/bigdata into dev_TPI 2017-08-11 10:39:22 +08:00
daiao d93ef96d66 评测区域代码优化 2017-08-11 10:38:57 +08:00
miss 67a4d2e5d0 修改 2017-08-11 10:38:56 +08:00
daiao f0b4b091b6 评测区域点击事件 2017-08-11 10:08:54 +08:00
daiao a7a9708979 隐藏质量分析 2017-08-11 10:01:23 +08:00
miss e6af828a81 动态加载 2017-08-11 09:24:37 +08:00
cxt 14d7d8fa7a 课程的新建和编辑的下拉框调整 2017-08-10 17:30:53 +08:00
daiao 0f5a29fbb4 TPI优化 2017-08-10 17:05:44 +08:00
daiao 38dd7bc9a0 Merge branch 'dev_TPI' of https://bdgit.trustie.net/hushasha/bigdata into dev_TPI 
Conflicts:
	public/javascripts/edu/edu_tpi.js
 2017-08-10 16:35:32 +08:00
daiao 8c4b647a04 TPI优化 2017-08-10 16:32:50 +08:00
miss a0ccd59250 Merge branch 'dev_TPI' of https://bdgit.trustie.net/hushasha/bigdata into dev_TPI 2017-08-10 16:24:06 +08:00
miss e2c9a094ff 加载修改 2017-08-10 16:23:12 +08:00
daiao f7841bcfde Merge branch 'dev_TPI' of https://bdgit.trustie.net/hushasha/bigdata into dev_TPI 2017-08-10 15:42:41 +08:00
daiao a0c2282fba tpi评测优化 2017-08-10 15:42:27 +08:00
miss 03180ed0a9 动态加载修改 2017-08-10 15:41:19 +08:00
daiao 460be95e0e 评测区域优化 2017-08-10 11:17:16 +08:00
daiao dca686ef3a 测试日志 2017-08-10 10:12:08 +08:00
daiao 0cc5137704 Merge branch 'dev_TPI' of https://bdgit.trustie.net/hushasha/bigdata into dev_TPI 2017-08-10 09:44:59 +08:00
daiao ebe121bca7 实训TPI的评测区域 2017-08-10 09:38:22 +08:00
miss b146a2b014 返回值 2017-08-10 09:37:12 +08:00
caishi 4a217fd38a 班级、课程页面改版 2017-08-10 09:21:48 +08:00
daiao f7f7f59586 评测区域优化 2017-08-10 09:14:09 +08:00
miss 692e6a31b4 xiugai 2017-08-10 09:00:06 +08:00
miss 4f0c798d7a Merge branch 'dev_TPI' of https://bdgit.trustie.net/hushasha/bigdata into dev_TPI 
# Conflicts:
#	public/javascripts/edu/edu_tpi.js
 2017-08-10 08:45:50 +08:00
daiao e3f3857d25 tpi测试集优化 2017-08-10 08:43:47 +08:00
miss 615997c554 123 2017-08-09 17:15:00 +08:00
daiao b93d6d5380 TPI优化 2017-08-09 17:14:21 +08:00
miss d2eaff3999 参数 2017-08-09 17:02:27 +08:00
miss b895cb4210 Merge branch 'dev_TPI' of https://bdgit.trustie.net/hushasha/bigdata into dev_TPI 2017-08-09 16:48:50 +08:00
miss b0991d4685 js 2017-08-09 16:47:43 +08:00
daiao cf7cba97b3 测试集点击效果 2017-08-09 16:38:08 +08:00
daiao f5551c78f4 实训TPI优化 2017-08-09 09:09:51 +08:00
daiao 0e4287710e 实训TPI优化 2017-08-08 17:13:50 +08:00
daiao a9519a51e4 优化tpi的js代码 2017-08-08 16:25:11 +08:00
daiao 5e6f4e3799 实训TPI结构优化 2017-08-08 14:00:49 +08:00
cxt c25b584898 实名认证和职业认证 2017-08-04 11:20:28 +08:00
cxt a18ce6d7cd Merge branch 'dev_cs' into dev_cxt 2017-08-01 16:50:03 +08:00
cxt 780f0d22e1 班级作业和讨论区点击回复时回复框获取焦点 2017-08-01 16:23:22 +08:00
caishi baacb95877 超级管理员tab切换样式修改 2017-08-01 14:57:35 +08:00
caishi 56d520c569 实训套件界面修改，以及tab样式的公用 2017-08-01 08:57:44 +08:00
miss 55b5b7fd03 拖拽留白区域的解决 
tip样式的完善
 2017-07-31 16:12:24 +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 a61b4c244b 留言页面删除留言的弹出框需要替换新样式 2017-07-28 14:35:30 +08:00
cxt e9e4b7177e Merge branch 'dev_xucheng' into develop 
Conflicts:
	Gemfile
	app/helpers/application_helper.rb
	app/views/managements/_shixun_authorization_list.html.erb
 2017-07-27 09:49:02 +08:00
XuCheng642 0621ceb861 超级管理员页面修改 2017-07-27 09:45:31 +08:00
cxt 4a0d8ab856 实训套件的编辑 2017-07-26 19:05:46 +08:00
cxt a48483ef69 实训套件的编辑页面 2017-07-26 18:57:08 +08:00
cxt 160e1514ca 实训套件新建流程和查看页面布局变更：Step1-增加新建独立页 2017-07-25 15:41:36 +08:00
cxt cbf111179b 实训新建、预备知识、配置页面的markdown自动保存 2017-07-21 10:03:30 +08:00
cxt c15080f5da 作业列表页面删除作业时需要给出一个加载提示层 2017-07-20 16:50:30 +08:00
cxt 816e6d605e 基本资料增加“昵称”，个人主页显示“昵称” 2017-07-18 14:47:50 +08:00
cxt 9f1ee5e5da first_level_discipline_id 2017-07-18 09:31:56 +08:00
cxt 7242bc73be 课程实训首页 2017-07-14 12:37:20 +08:00
cxt 5535bfc62e 课程实训的新建编辑 2017-07-14 09:58:20 +08:00
cxt 9cc454fa3b 课程的参考资料保存需要优化 2017-07-11 10:53:50 +08:00
cxt 627436e8a8 作业设置中的匿评点击无效果 2017-07-10 09:50:02 +08:00
cxt 4cf34198f0 编辑作业输入错误答案点击提交会弹出提示框，点击取消再去提交就会不给提示框就直接提交成功了 2017-07-07 21:10:55 +08:00
cxt 537bd14aa9 新建作业和题库时关掉提示信息后无法再次显示 2017-07-07 20:36:17 +08:00
cxt 7b9c59d6e8 基础数据加上“专业”、“课程”，实训的适用专业和课程 2017-07-06 17:52:59 +08:00
cxt b9eef2c887 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-05 10:13:04 +08:00
cxt cebd0c6c77 新建班级中的学分保留一位小数 2017-07-04 16:26:18 +08:00
cxt adc677b0d8 作业设置改成整页保存 2017-07-04 14:20:25 +08:00
daiao 0bdd38d264 管理员用户列表页面 2017-07-04 09:51:51 +08:00
daiao 6ab954372a 管理员用户列表 2017-07-03 10:57:30 +08:00
cxt c5510912ec 分组作业提示错误 2017-06-30 23:32:50 +08:00
cxt 6309eb1c80 火狐浏览器阻止enter键提交表单 2017-06-30 22:32:02 +08:00
cxt 5f71476e7a 课堂授课大纲颜色不正确 2017-06-30 19:46:48 +08:00
cxt b3cff42793 没有提交过补交内容，进行补交时不上传附件只输入理由点击确定，跳转500 2017-06-30 17:10:06 +08:00
cxt 47ff17fbbb Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-30 16:28:35 +08:00
daiao d61ac51c55 恢复示例代码没有显示转圈等待，突然就刷新了 2017-06-30 15:43:01 +08:00