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

22667 Commits

Author SHA1 Message Date
daiao c728f4caa1 Merge branch 'develop' into dev_daiao 2017-09-30 22:35:10 +08:00
daiao 0878597cc4 贴吧样式冲突 2017-09-30 22:34:48 +08:00
daiao 236445e368 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 22:02:25 +08:00
daiao 880f9a7c06 还原TPI回复功能 2017-09-30 22:02:04 +08:00
daiao 49ffc348e2 Merge branch 'dev_daiao' into develop 
Conflicts:
	app/views/games/_shixun_comment_list.html.erb
 2017-09-30 21:40:23 +08:00
huang a3c8e28c52 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 21:40:12 +08:00
huang 77f0001cd0 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 21:38:18 +08:00
huang a9c5a42594 实训修改代码不重置 2017-09-30 21:37:43 +08:00
daiao 766f1a416e Merge branch 'dev_daiao' of https://bdgit.trustie.net/hushasha/bigdata into dev_daiao 2017-09-30 21:35:11 +08:00
daiao 112f350995 帖子回复功能 2017-09-30 21:34:57 +08:00
miss 6d940e2b61 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 21:28:02 +08:00
miss 4e2b8184fa 文件路径弹框的滚动条增加 2017-09-30 21:27:37 +08:00
huang dc17d4d6c5 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 21:27:34 +08:00
huang d6517c11c1 实训搜索添加verilog类型搜索 2017-09-30 21:26:52 +08:00
caishi 918cba0f95 技能标签 2017-09-30 21:26:22 +08:00
miss abf89afc37 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 21:17:31 +08:00
huang 8c0bc45909 Merge branch 'dev_huang' into develop 2017-09-30 21:15:17 +08:00
miss 9d1f88a71a Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-09-30 21:12:44 +08:00
miss 48fc5484bb 文件路径的获取 2017-09-30 21:12:22 +08:00
huang 2dd285f6e7 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 21:06:25 +08:00
huang 88d151ec31 Merge branch 'dev_huang' into develop 2017-09-30 21:06:10 +08:00
cxt 8e250f6774 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 21:02:51 +08:00
cxt 7861ed7499 班级动态显示帖子菜单需要与帖子列表中的菜单保持一致 2017-09-30 21:02:18 +08:00
huang 500d8e1082 指定文件目录代码为空的时候给出提示 2017-09-30 20:51:02 +08:00
cxt f4ba07cc82 学生匿评多次时，应该覆盖上一条评分，且给出提交弹框的内容改为“评分已更新” 2017-09-30 20:46:57 +08:00
caishi ae68c11d84 Merge branch 'dev_daiao' of https://bdgit.trustie.net/hushasha/bigdata into dev_daiao 2017-09-30 20:42:48 +08:00
caishi 76b27ffe83 TPI评论 2017-09-30 20:42:15 +08:00
huang a2837e8cfa Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-09-30 20:41:35 +08:00
huang c6c9507abe 文件目录添加根目录 2017-09-30 20:41:05 +08:00
miss a9826d556a 文件路径的提示 2017-09-30 20:32:57 +08:00
miss bf9046ec27 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 
# Conflicts:
#	app/views/shixuns/_achieve_ways.html.erb
 2017-09-30 20:11:55 +08:00
miss 0760e7d9e0 路径的获取 2017-09-30 20:10:35 +08:00
huang 2f0d5155ef 去掉注释 2017-09-30 20:09:23 +08:00
huang c1b4199f24 实训路径目录回退效果 2017-09-30 20:08:42 +08:00
daiao e00bb90c23 Merge branch 'develop' into dev_daiao 
Conflicts:
	app/views/games/_shixun_comment_list.html.erb
	app/views/layouts/_logined_header.html.erb
 2017-09-30 19:51:30 +08:00
daiao 7dcc150a25 贴吧缺陷修复 2017-09-30 19:49:53 +08:00
caishi 1cdecbb312 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 19:42:39 +08:00
miss 87401900d3 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 
# Conflicts:
#	app/views/shixuns/_achieve_ways.html.erb
 2017-09-30 19:42:18 +08:00
caishi 274095eed2 合作者 2017-09-30 19:41:06 +08:00
huang 1fd9f3a9dd 文件目录权限 2017-09-30 19:39:13 +08:00
miss d46088baf0 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-09-30 19:25:42 +08:00
huang b2304597b4 实训路径文件目录选择 2017-09-30 19:25:35 +08:00
daiao cb13f6d360 Merge branch 'dev_daiao' of https://bdgit.trustie.net/hushasha/bigdata into dev_daiao 2017-09-30 19:24:20 +08:00
miss a45a85cce8 弹框样式 2017-09-30 19:23:51 +08:00
daiao a5289610a3 实训TPI的回复 2017-09-30 19:23:38 +08:00
cxt ffe6388ef9 实训作业列表不需要显示未评，实训作业详情页面“你的评阅”需要隐藏 2017-09-30 19:17:51 +08:00
cxt e88c3d97ac 在线课堂首页中我管理的数据应该与我的主页一致，显示身为管理员和教师的课堂 2017-09-30 19:05:41 +08:00
huang 47439cb94d Merge branch 'develop' into dev_huang 
Conflicts:
	app/controllers/shixuns_controller.rb
 2017-09-30 18:43:16 +08:00
cxt f9a8519cc1 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 18:41:14 +08:00
cxt 4d4251ecfc Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 18:40:18 +08:00