wangtao
/
trustieplus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,860 Commits 7 Branches 0 Tags 0 B
Commit Graph

263 Commits

Author SHA1 Message Date
cxt 3f027ea05c Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	app/views/games/_game_show.html.erb
 2017-10-13 18:57:16 +08:00
daiao 9a798f3944 Merge branch 'dev_daiao' into develop 
Conflicts:
	app/views/praise_tread/_edu_praise.html.erb
	app/views/users/show.html.erb
 2017-10-13 18:53:32 +08:00
cxt 0ad4779842 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 18:47:33 +08:00
daiao d4dfa38bd9 PHP/Web实训功能 2017-10-13 14:16:14 +08:00
cxt d3e65e7bca 实训作业的导出成绩 2017-10-12 19:52:35 +08:00
XuCheng642 ee9dc6c6aa Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	app/controllers/managements_controller.rb
	app/views/users/show.html.erb
 2017-10-12 17:01:44 +08:00
XuCheng642 c72c4d2076 单位修改 2017-10-12 16:53:00 +08:00
cxt b8a958ddbb Merge branch 'dev_cs' into dev_cxt 
Conflicts:
	app/views/exercise/_new_question.html.erb
 2017-10-12 15:29:11 +08:00
daiao 9df7340f13 新增实训fork的列表页面 2017-10-12 11:18:27 +08:00
daiao 091ee1e352 各种错误页面（无权限等）的用户反馈，在论坛中的来源文字修改 2017-10-11 17:05:00 +08:00
cxt 9739f2bdae 基本资料保存时，同单位同学号不能保存 2017-10-09 16:22:55 +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
daiao 112f350995 帖子回复功能 2017-09-30 21:34:57 +08:00
huang c6c9507abe 文件目录添加根目录 2017-09-30 20:41:05 +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 91ba070ca8 Merge branch 'dev_cxt' into develop 
Conflicts:
	app/helpers/application_helper.rb
	app/views/messages/_course_show.html.erb
	app/views/student_work/index.html.erb
	public/stylesheets/css/taskstyle.css
 2017-09-30 16:33:07 +08:00
cxt d38a301ca8 已发布的实训路径增加“撤销发布”功能 2017-09-30 16:30:49 +08:00
huang cba5c75ba0 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-09-30 15:37:01 +08:00
huang b54362162c Merge branch 'develop' into dev_huang 2017-09-30 15:36:48 +08:00
miss c8262cfeaa 文件路径的弹框 2017-09-30 15:32:27 +08:00
huang 3c19e12081 实训版本库代码同步功能 2017-09-30 10:42:26 +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
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 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
cxt e13bb9316f 试卷的插入、上下移动、删除等功能 2017-09-29 15:55:37 +08:00
cxt 7aef72d7a3 在线试卷 2017-09-28 16:51:15 +08:00
daiao bfd4ee86ec 一级回复与点赞功能 2017-09-28 15:28:03 +08:00
cxt 016741ed35 超级管理员的实训作业统计 2017-09-26 14:31:04 +08:00
daiao 71e7725e5c 贴吧 2017-09-26 08:40:27 +08:00
huang ec56f1f05a 文件目录 2017-09-25 16:50:51 +08:00
XuCheng642 23550b8923 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	app/controllers/managements_controller.rb
 2017-09-22 18:48:03 +08:00
XuCheng642 ad993b64d1 管理员界面消息列表 2017-09-21 20:59:39 +08:00
huang 66ef740235 复制注释 2017-09-19 17:25:03 +08:00
cxt 3d0f1839a7 Merge branch 'dev_cs' into develop 
Conflicts:
	app/views/challenges/_single_or_multiple_question.html.erb
	app/views/messages/_common_reply_box.html.erb
	app/views/praise_tread/_edu_praise.html.erb
	app/views/student_work/_common_reply_box.html.erb
 2017-09-15 21:05:56 +08:00
cxt a69dc16af5 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 
Conflicts:
	app/views/courses/settings/_all_student_list_block.html.erb
 2017-09-15 21:02:10 +08:00
cxt d2d388972a 班级页面的分班 2017-09-15 20:59:35 +08:00
caishi c2dec1bddc Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 2017-09-15 20:12:52 +08:00
huang 730e8264c0 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 
Conflicts:
	app/controllers/courses_controller.rb
	app/views/courses/settings/_all_student_list.html.erb
 2017-09-15 19:09:31 +08:00
huang d713ce6de0 批量导入Excel文件到课程列表 2017-09-15 19:03:36 +08:00
XuCheng642 ac28f83271 Merge branch 'develop' into dev_xucheng 
Conflicts:
	app/controllers/managements_controller.rb
	app/helpers/application_helper.rb
	app/views/subjects/_subject_list.html.erb
	config/routes.rb
 2017-09-15 18:35:37 +08:00
caishi 2f52d3456e Merge branch 'dev_daiao' into dev_cs 2017-09-15 18:29:34 +08:00
miss ac2af05d28 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 18:13:14 +08:00
cxt 508139c57c Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 
Conflicts:
	app/views/courses/settings/_all_student_list.html.erb
 2017-09-15 15:12:09 +08:00
cxt 6469fc1563 课堂的调整 2017-09-15 15:10:35 +08:00
huang 3e07f18be5 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 
Conflicts:
	app/views/courses/settings/_all_student_list.html.erb
 2017-09-15 10:55:32 +08:00
huang 63cd1ba6ab 新 2017-09-15 10:50:05 +08:00
daiao 0204232e49 导出excel 2017-09-15 10:39:07 +08:00
caishi efd402bed5 Merge branch 'dev_daiao' into dev_cs 
Conflicts:
	app/views/challenges/edit.html.erb
	public/stylesheets/css/edu-common.css
 2017-09-15 09:29:42 +08:00
daiao ec22bbe0c1 Merge branch 'develop' into dev_daiao 
Conflicts:
	app/controllers/games_controller.rb
	app/views/challenges/edit.html.erb
	app/views/games/_game_show.html.erb
	public/stylesheets/css/edu-common.css
 2017-09-15 09:10:36 +08:00