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

244 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 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
cxt 3534ec2ac9 分组作业提交作业页面，小组成员搜索框输入关键字后回车，页面直接保存跳转至详情页面，应该回车同搜索效果 2017-06-30 14:40:01 +08:00
daiao 289ff1a329 Merge branch 'dev_daiao' into develop 
Conflicts:
	app/views/users/_my_homepage_shixuns_list.html.erb
 2017-06-30 09:54:09 +08:00
daiao baa0809549 个人主页（翻页问题未解决） 2017-06-29 16:59:14 +08:00
daiao 99d0885367 我的留言 2017-06-28 16:42:38 +08:00
cxt 5508cedb45 实训作业 2017-06-28 15:23:09 +08:00
daiao 058b7e1d7d 统一确认弹框的公共样式 2017-06-28 10:05:23 +08:00
cxt 0bd49899c7 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-23 20:02:29 +08:00
cxt 7d34acfc95 分组作业的相关调整 2017-06-23 19:46:21 +08:00
daiao 2e93350e15 缺陷修复 2017-06-23 19:27:22 +08:00
daiao 6f04200f5f 修复缺陷 2017-06-23 17:32:26 +08:00
cxt a9d556dc60 实训重置弹框 2017-06-23 15:13:45 +08:00
daiao e2c15578c4 Merge branch 'dev_daiao' into develop 
Conflicts:
	app/controllers/managements_controller.rb
	config/routes.rb
 2017-06-23 11:20:15 +08:00
cxt 96165230ad 实训流程 2017-06-23 10:38:40 +08:00
daiao 69d5a6eafb 用户试用认证 2017-06-22 17:03:00 +08:00
daiao 6c95a2732a 用户授权列表 2017-06-22 09:31:08 +08:00
daiao 08b7446bd0 用户认证 2017-06-19 17:04:55 +08:00
cxt 72b96c6038 追加附件只能上传一个附件 2017-06-16 20:11:55 +08:00
cxt 4130c6045a Merge branch 'develop' into dev_cxt 2017-06-16 19:09:18 +08:00
cxt d1637b3cde 个人主页的tab样式与“我的实训”保持一致 2017-06-16 19:07:31 +08:00
daiao de26c97dbc 实训合作者搜索上次搜索的内容不显示 2017-06-16 17:42:41 +08:00
daiao a0562d01e9 安全设置邮箱绑定设置了Hotmail的邮箱，点击去查看跳转页面不正确 2017-06-16 17:20:27 +08:00
daiao aaac786745 修改密码中重设新密码不正确后给出的提示会一直显示到保存成功，应该每输入一次密码就应该做一次判断 2017-06-16 16:55:07 +08:00
cxt 033c22ee3f 上传头像点击确定跳转 2017-06-16 16:50:50 +08:00
daiao 4584276cbd Merge branch 'dev_daiao' into develop 2017-06-16 15:33:31 +08:00
cxt 1aa0ce78c3 新版题库 2017-06-16 15:18:41 +08:00
cxt 72369ff2fd 班级作业的设置和列表变更 2017-06-14 15:01:44 +08:00
daiao 91d3bc04b5 个人主页的课堂列表和实训列表底部的“点击查看全部”更换成换页 2017-06-14 10:27:49 +08:00
cxt cb12147d11 作品补交、补交附件 2017-06-14 09:25:09 +08:00
daiao 5c071fe236 实训首页的搜索框删除关键字后点击搜索页面不刷新 2017-06-13 17:22:42 +08:00
cxt f77b829fdc 作业详情页面的头部样式需和我的实训页面样式一样 2017-06-12 17:33:28 +08:00
cxt da87db878b 邮箱注册的调整 2017-06-12 16:02:07 +08:00
cxt b00818d427 作业评分设置的完善 2017-06-09 20:45:04 +08:00
cxt a86d2bf7fe 作业列表页面除了提交状态的可以导出作品，其他状态的点击导出作品无效果 2017-06-09 15:21:05 +08:00
cxt 6a4ba18126 作业设置的完善 2017-06-09 11:19:14 +08:00
cxt 1f04cd1285 作品评分 2017-06-08 17:39:29 +08:00
cxt 9e9772b24d 去掉课程名称的前后空白符 2017-06-08 15:03:13 +08:00
cxt 25c0c9cab7 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-07 16:19:48 +08:00
cxt be5ba44a5a 班级资源的上传资源弹框改版 2017-06-07 15:24:19 +08:00
cxt 077168328c 班级资源更新版本的弹框改版 2017-06-07 11:16:09 +08:00
daiao 9ea224a01c 试用授权相关的遮罩页面 2017-06-07 10:19:55 +08:00
cxt 75b37651fa 班级资源页面的发送点击无效，应该与课程的选用按钮相类似 2017-06-06 17:20:33 +08:00
cxt ee536468f3 作业页面新建作业，没有选择类别就进行确定，给出的提示做一行显示在作业类别上方 2017-06-06 11:07:06 +08:00
cxt 6fc34f0ad0 班级设置中的班级名称，框内例子与框外提示不一致，请按第二张图进行修改 2017-06-05 16:45:00 +08:00
cxt 292b72f950 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-02 20:28:21 +08:00
cxt 49bab55334 作品列表的“分班情况”无法勾选2个 2017-06-02 19:24:51 +08:00
cxt 8a6101002e 作业列表的导出作品附件，弹框需要更换样式 2017-06-02 19:09:30 +08:00
cxt 02f83c965f 验证拖拽框 2017-06-02 19:06:37 +08:00
daiao 560655c28e 立即激活邮箱 2017-06-02 17:51:13 +08:00
cxt c520c31640 弹框调整 2017-06-02 14:52:07 +08:00
cxt 6ff88ef129 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-06-02 14:27:42 +08:00
cxt 15345d93bd 作品列表的多条件筛选 2017-06-02 14:27:12 +08:00
huang b5e3d9de3f 解决实训作业无法创建的问题 2017-06-02 11:21:23 +08:00
daiao acc7f95477 平台关于附件删除icon的显示需要统一调整 2017-05-31 17:18:13 +08:00
cxt 24673ef192 作业设置页的“×”取消按钮点击应该有弹框提示 2017-05-31 11:02:30 +08:00
cxt 8d0bb43e9c 修改密码页原始密码的验证有错 2017-05-27 11:15:06 +08:00
cxt dfb8e6f576 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	app/views/courses/settings.html.erb
 2017-05-27 10:32:17 +08:00
Linda de7b0089ee 修改资料的安全设置中，icon样式和显示问题 2017-05-26 17:04:22 +08:00
Linda aaf2726651 资源的“删除”垃圾箱出现的太早，导致资源名称很早就被“...”了 2017-05-26 15:56:51 +08:00
cxt 8454330981 作业动态的齿轮菜单内容请修正 2017-05-26 15:46:26 +08:00
cxt 96db0b75f9 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	app/views/account/user_join.html.erb
	app/views/layouts/base_edu_course.html.erb
 2017-05-25 17:34:51 +08:00
huang 8e7756d45c js弹框点击确定的时候隐藏弹框 2017-05-25 15:07:11 +08:00
cxt 6705c35b82 修改密码的“新密码”提示和check请修正、避免邮箱恶意注册，请增加验证块 2017-05-25 11:12:59 +08:00
cxt 4c00cd2746 动态的回复和多级回复点击，看不到输入框 2017-05-25 10:06:52 +08:00
cxt ce440eacb0 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	app/views/syllabuses/_syllabus_homeworks.html.erb
 2017-05-24 21:07:32 +08:00
cxt 0224442439 作业的匿评设置选择了匿评，但是评分设置无法正确显示、评分设置选择了“单项评分优先”却无法正确保存 2017-05-24 19:57:59 +08:00
Linda 7ae8f91446 新建作业的页面样式有点问题 2017-05-24 15:41:55 +08:00
cxt 599869f970 作业的回复 2017-05-23 22:55:20 +08:00
cxt d64aba1391 作业的编辑 2017-05-23 18:52:58 +08:00
cxt 1e8a36a8d2 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt 
Conflicts:
	app/views/student_work/show.html.erb
 2017-05-23 15:32:16 +08:00
cxt 935922b365 普通、编程、分组作业的提交和编辑 2017-05-23 15:18:53 +08:00
huang c9593f7d17 实训作业 2017-05-22 21:31:28 +08:00
huang 65e85e7bdc 实训作业（未完） 2017-05-22 15:52:45 +08:00
huang 61f2f632ca Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt 
Conflicts:
	app/views/homework_common/index.html.erb
	app/views/layouts/base_edu.html.erb
 2017-05-22 11:14:18 +08:00
cxt f46bd2ac06 新版作业 2017-05-22 10:29:51 +08:00
daiao 598a11ed19 参考答案点击修改， 课程作业列表tab点击事件调整 2017-05-21 15:00:24 +08:00
daiao 77ce7da426 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-19 19:39:24 +08:00
daiao a8401ac241 作业列表7个tab与收缩框并列查询 2017-05-19 19:39:04 +08:00
huang 7ad005d28e 合作者提供删除功能 2017-05-19 17:14:15 +08:00
huang 287ddf7115 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-19 16:56:31 +08:00
huang f88bf9bcdb 实训添加合作者功能 2017-05-19 16:56:09 +08:00
daiao 9c801959fb 我的主页课堂列表与课程页列表添加切换列表事件 2017-05-19 16:44:57 +08:00
daiao c2101ad90b 新版上传头像的弹框 2017-05-19 15:46:19 +08:00
huang aa7bb35cc9 个人主页实训tab 2017-05-19 10:34:56 +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 45fecb8b8d 新建作业和作业设置 2017-05-18 15:39:53 +08:00
daiao beb4bf04fc 作业列表的tab加入点击事件 2017-05-18 15:38:29 +08:00
cxt 528e08be04 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt 2017-05-13 22:24:14 +08:00
cxt 0e868b45d7 班级新建和设置（除模块设置） 2017-05-13 22:23:53 +08:00
miss b1b061eeaa 调整样式及部分结构 2017-05-12 21:24:01 +08:00
cxt 98363d6c92 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-08 15:26:30 +08:00
cxt 9e04ed6a2d 课程的资源和题库选用到班级 2017-05-08 15:26:16 +08:00
daiao b25bf8abb3 测试集多行内容时，样式不正确 2017-05-08 14:35:33 +08:00
cxt 6fe571cc99 课程资源库和课程题库 2017-05-05 19:36:32 +08:00
cxt 5e82ef00ba 身份认证 2017-05-04 14:33:50 +08:00
cxt 60d33cf661 课程首页（除课程资源库和课程题库） 2017-04-28 22:53:34 +08:00
cxt c49ddaf5f7 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt 
Conflicts:
	app/views/users/show.html.erb
 2017-04-27 15:56:17 +08:00
cxt a69ba56711 基本资料的修改 2017-04-27 15:53:13 +08:00
miss 37c9e2494a 滚动条和回到顶部按钮的修改 2017-04-26 10:15:21 +08:00
miss c3c1fd7ae7 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt 
Conflicts:
	app/views/users/show.html.erb
 2017-04-26 09:17:39 +08:00
chenglong d9b675f745 页面样式的修正 2017-04-26 08:40:16 +08:00
cxt d2f659476e 样式调整 2017-04-21 22:51:57 +08:00
cxt 9e7624f90a Merge branch 'dev_cxt' into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
	public/stylesheets/css/bigdata-common.css
 2017-04-21 22:10:17 +08:00
cxt 7a5befcec1 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt 2017-04-21 22:04:06 +08:00
cxt f653d694d6 安全设置 2017-04-21 22:03:51 +08:00
chenglong fff34b8c70 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt 2017-04-21 21:23:34 +08:00
chenglong a69a0f4f38 再次修改页面效果 2017-04-21 21:22:15 +08:00
cxt 0cae922bf1 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt 2017-04-21 20:30:10 +08:00
cxt 09482fea09 基本资料 2017-04-21 20:29:35 +08:00
chenglong 8e2cce8fd2 静态页面的修改 2017-04-21 20:06:54 +08:00
cxt 046f73d2c6 新版个人首页 2017-04-20 17:17:02 +08:00
Linda 4bda94638f tittle提示整体美化 2017-04-18 16:14:45 +08:00
cxt 95911cd2ae 新版课程相关后台架构的搭建 2017-04-14 09:28:00 +08:00
cxt 7b977e9fcc 基本资料相关后台开发 2017-04-11 16:19:35 +08:00
huang 1fc92c5c88 first commit 2017-04-07 10:16:13 +08:00