kevinli
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,568 Commits 3 Branches 0 Tags 460 MiB
Commit Graph

22568 Commits

Author SHA1 Message Date
caishi c7ac2bdb41 Merge branch 'dev_cxt' into dev_cs 
Conflicts:
	app/views/messages/_course_show.html.erb
	app/views/student_work/index.html.erb
 2017-09-30 18:27:00 +08:00
caishi 18b01609cc 保存多选题 2017-09-30 18:23:35 +08:00
caishi 5ee2755dd2 新建试卷入口 2017-09-30 16:45:49 +08:00
caishi 7771a83ea9 删除选项 2017-09-30 16:30:43 +08:00
cxt 1b5b77b6c5 测验的编辑 2017-09-30 16:10:07 +08:00
caishi d29ffa7f47 TPI中的全部任务，技能标签 +０　更换成“无” 2017-09-30 15:35:23 +08:00
caishi 342204cb69 Merge branch 'develop' into dev_cs 2017-09-30 15:07:59 +08:00
caishi 5734398b38 去掉讨论-帖子列表里面的帖子总数 2017-09-30 15:07:33 +08:00
cxt 3b25304329 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt 
Conflicts:
	app/views/exercise/student_exercise_list.html.erb
 2017-09-30 14:38:16 +08:00
cxt 799d97d640 老师评阅 2017-09-30 14:36:17 +08:00
caishi 7c23cd9948 动态新建 2017-09-30 10:29:59 +08:00
caishi b900ad466d Merge branch 'develop' into dev_cs 2017-09-30 10:05:22 +08:00
caishi b17691a9ab 学生列表加作业成绩列 2017-09-30 10:00:50 +08:00
caishi 25691d9c65 论坛帖子详情显示 2017-09-30 09:33:38 +08:00
caishi 2266ff1eae 动态新建 2017-09-29 22:04:47 +08:00
caishi 9f8a01aa0a Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-29 22:02:26 +08:00
caishi ca2ddbb90c 动态新建 2017-09-29 22:01:56 +08:00
XuCheng642 2689e95638 Merge branch 'dev_xucheng' into develop 2017-09-29 21:57:09 +08:00
XuCheng642 2e8151b123 Merge branch 'develop' into dev_xucheng 2017-09-29 21:56:46 +08:00
XuCheng642 3424b03f77 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-29 21:56:16 +08:00
XuCheng642 39c2e4ee18 Merge branch 'dev_xucheng' into develop 2017-09-29 21:55:48 +08:00
XuCheng642 368d19fc73 Merge branch 'develop' into dev_xucheng 2017-09-29 21:55:26 +08:00
XuCheng642 601ddd46f6 Merge branch 'dev_xucheng' into develop 2017-09-29 21:54:55 +08:00
caishi 4ee161c720 新建话题回车事件 2017-09-29 21:53:20 +08:00
XuCheng642 fbf3d3f747 作业回复链接 2017-09-29 21:53:08 +08:00
caishi 246783284c Merge branch 'dev_daiao' into develop 2017-09-29 21:49:33 +08:00
caishi 0e933e3393 Merge branch 'dev_cs' into develop 2017-09-29 21:48:30 +08:00
caishi 3e6bc1894a 论坛列表 2017-09-29 21:46:49 +08:00
caishi a0de6028e7 合作者弹框 2017-09-29 21:35:43 +08:00
caishi 82890205c5 Merge branch 'develop' into dev_cs 2017-09-29 21:23:27 +08:00
caishi bb5dc3af6f Merge branch 'dev_daiao' into develop 
Conflicts:
	app/views/messages/_common_reply_box.html.erb
 2017-09-29 21:18:50 +08:00
caishi 7f489fddc8 问吧样式、链接修改 2017-09-29 21:15:48 +08:00
XuCheng642 50f72b6f96 Merge branch 'develop' into dev_xucheng 2017-09-29 20:26:18 +08:00
XuCheng642 7738fe021a Merge branch 'dev_xucheng' into develop 2017-09-29 20:24:58 +08:00
XuCheng642 811ea0f324 Merge branch 'develop' into dev_xucheng 
Conflicts:
	app/views/managements/_leave_message_list.html.erb
 2017-09-29 20:18:23 +08:00
caishi cd3c25d600 编辑试卷 2017-09-29 19:25:06 +08:00
XuCheng642 917b41ac0f Fork功能缺陷修复 2017-09-29 19:22:54 +08:00
XuCheng642 4617e8d803 自动授权学校 2017-09-29 18:44:40 +08:00
XuCheng642 d938f413f7 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-29 18:38:31 +08:00
XuCheng642 231fa0dcf7 链接 2017-09-29 18:38:21 +08:00
cxt ad324eb899 迁移文件 2017-09-29 18:20:57 +08:00
cxt f98f554aaf 试卷 2017-09-29 18:18:38 +08:00
XuCheng642 c8a1c5fc81 lianjei 2017-09-29 17:05:35 +08:00
XuCheng642 dcb3662744 Merge branch 'develop' into dev_xucheng 2017-09-29 16:44:40 +08:00
XuCheng642 2e2fb7a69e Merge branch 'dev_xucheng' into develop 2017-09-29 16:43:03 +08:00
XuCheng642 1cb048adae 样式 2017-09-29 16:41:40 +08:00
XuCheng642 d679111b41 Merge branch 'develop' into dev_xucheng 
Conflicts:
	app/views/shixuns/_shixun_top.html.erb
	public/stylesheets/css/edu-common.css
 2017-09-29 16:35:44 +08:00
XuCheng642 164022a23e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-29 16:24:22 +08:00
XuCheng642 cbb648dd40 自动授权列表 2017-09-29 16:18:41 +08:00
daiao 60a1e135a8 Merge branch 'dev_daiao' into develop 2017-09-29 16:03:57 +08:00