jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,245 Commits 98 Branches 0 Tags 0 B
Commit Graph

1957 Commits

Author SHA1 Message Date
huang 01fd32fdd6 统计 2017-03-24 19:30:50 +08:00
cxt e3150716f3 Merge branch 'dev_bigdata' into dev_shixun_project 
Conflicts:
	app/views/layouts/_footer.html.erb
	app/views/layouts/base_contest_community.html.erb
	app/views/layouts/base_contests.html.erb
	app/views/layouts/base_course_community.html.erb
	app/views/layouts/base_courses.html.erb
	app/views/layouts/base_project_community.html.erb
	app/views/layouts/new_base.html.erb
	app/views/layouts/new_base_user.html.erb
	db/schema.rb
	public/stylesheets/css/structure.css
	public/stylesheets/font/FontAwesome.otf
	public/stylesheets/font/fontawesome-webfont.eot
	public/stylesheets/font/fontawesome-webfont.svg
	public/stylesheets/font/fontawesome-webfont.ttf
	public/stylesheets/font/fontawesome-webfont.woff
	public/stylesheets/font2/FontAwesome.otf
	public/stylesheets/font2/fontawesome-webfont.eot
	public/stylesheets/font2/fontawesome-webfont.svg
	public/stylesheets/font2/fontawesome-webfont.ttf
	public/stylesheets/font2/fontawesome-webfont.woff
	public/stylesheets/fonts/FontAwesome.otf
	public/stylesheets/fonts/fontawesome-webfont.eot
	public/stylesheets/fonts/fontawesome-webfont.svg
	public/stylesheets/fonts/fontawesome-webfont.ttf
	public/stylesheets/fonts/fontawesome-webfont.woff
 2017-03-24 16:17:01 +08:00
huang cacf0f1354 一些统计 2017-03-24 15:59:52 +08:00
huang 62ab862516 tpm权限控制 
及index一些统计
 2017-03-23 17:41:32 +08:00
huang 76a630c6be 公共方法的封装 2017-03-21 20:06:39 +08:00
huang 48913a3c8c 公共方法封装 2017-03-20 14:51:07 +08:00
huang 57f74bb56c 自动化构建game 2017-03-17 17:16:10 +08:00
huang 0263165c2b game中任务任务自动功能 
ajax局部实现show and index
 2017-03-17 12:42:58 +08:00
huang 59608d5f1d challenge创建 2017-03-16 16:59:53 +08:00
huang c7cf576aae games下一关方法封装，部分模块封装 2017-03-15 17:15:41 +08:00
cxt c4d9f3c67c Merge branch 'develop' into dev_bigdata 
Conflicts:
	app/controllers/account_controller.rb
	app/views/layouts/_footer.html.erb
	app/views/layouts/_logined_header.html.erb
	app/views/layouts/base_contest_community.html.erb
	app/views/layouts/base_contests.html.erb
	app/views/layouts/base_course_community.html.erb
	app/views/layouts/base_courses.html.erb
	app/views/layouts/base_project_community.html.erb
	app/views/layouts/base_syllabus.html.erb
	app/views/layouts/new_base.html.erb
	app/views/layouts/new_base_user.html.erb
	app/views/layouts/new_base_user_show.html.erb
	public/stylesheets/css/structure.css
 2017-03-15 15:28:56 +08:00
huang 6ec7769c0e Merge branch 'dev_bigdata' into dev_shixun_project 
Conflicts:
	app/controllers/account_controller.rb
	app/views/layouts/_footer.html.erb
	app/views/layouts/_logined_header.html.erb
	app/views/layouts/base_contest_community.html.erb
	app/views/layouts/base_contests.html.erb
	app/views/layouts/base_course_community.html.erb
	app/views/layouts/base_courses.html.erb
	app/views/layouts/base_project_community.html.erb
	app/views/layouts/base_syllabus.html.erb
	app/views/layouts/new_base.html.erb
	app/views/layouts/new_base_user.html.erb
	app/views/layouts/new_base_user_show.html.erb
	public/stylesheets/css/structure.css
 2017-03-14 09:30:02 +08:00
huang 8bbee334c3 实训开启显示权限控制 2017-03-13 15:18:53 +08:00
cxt 15b1a82cd4 竞赛作品允许补交 2017-03-13 15:11:28 +08:00
cxt b1f19ccb5f 无权限下载 2017-03-13 11:29:03 +08:00
huang fbc52a7892 games模块相关功能 2017-03-13 09:00:13 +08:00
huang 828dce5d07 修复500问题 2017-03-12 12:09:29 +08:00
huang a43167c6cf 修复500 2017-03-12 11:53:15 +08:00
huang 6183db782a games模块开发 2017-03-10 15:41:44 +08:00
huang 6d182eca2c shixun测试 2017-03-09 17:03:50 +08:00
huang 8526c409b5 build输出结果记录 2017-03-09 14:51:39 +08:00
huang 8d6fb4d071 完成challenge build 2017-03-08 16:36:19 +08:00
huang e753d0453c 实训开启后完成任务的自动创建 2017-03-08 15:37:48 +08:00
huang 622b7a4979 TPI开启任务模块 2017-03-08 14:59:40 +08:00
cxt 7de40ac88b 用户反馈（微信群）-评分作品被修改的提醒 2017-03-08 09:54:15 +08:00
huang 3742757ae6 shixun job create 2017-03-07 18:19:50 +08:00
huang dd31a55bdd Merge branch 'develop' into dev_shixun_project 
Conflicts:
	db/schema.rb
 2017-03-07 09:32:40 +08:00
huang 956a078a36 challeng模块新建、create 2017-03-06 17:36:01 +08:00
huang 8d54187e04 周五内容 2017-03-03 18:49:56 +08:00
cxt 96312c6dfa Merge branch 'cxt_course' into develop 2017-03-03 14:45:30 +08:00
huang c14840ef83 实训项目基础框架搭建及相关关联 2017-03-02 15:44:56 +08:00
cxt baabce13b2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	db/schema.rb
	public/stylesheets/css/common.css
	public/stylesheets/css/courses.css
 2017-02-28 10:15:33 +08:00
cxt 524dd85409 班级新建作业，加入题库时，没有将附件一起加入 2017-02-28 10:11:58 +08:00
cxt 6329578f9b 没有登录平台或者没有加入竞赛的用户在点击作品提交时，请给出相应的提示 2017-02-27 14:12:49 +08:00
cxt e658a5426d 班级作业加入题库，题库中该作业的引用数是零 2017-02-24 17:18:32 +08:00
cxt 099fcde246 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2017-02-24 15:20:34 +08:00
cxt 3e3ad381b1 竞赛：改了提交截止日期，显示的还是提交已截止 2017-02-24 14:29:41 +08:00
cxt 0e40bf6daf 题库改版 2017-02-24 10:32:48 +08:00
huang b08a8e8050 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-22 15:52:05 +08:00
daiao 06306e0214 实训项目叠层回复功能 2017-02-22 10:08:05 +08:00
huang 96aa9b7261 实训项目一些调整，api和结构 2017-02-22 08:54:38 +08:00
daiao 544432adce 实训任务详情页面的一级回复功能 2017-02-21 14:38:05 +08:00
huang 336c28ccdb 实训项目权限控制 2017-02-20 12:33:27 +08:00
huang 82c6799953 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 
Conflicts:
	db/schema.rb
 2017-02-19 14:40:27 +08:00
huang df66e6d60c 启动任务相关接口 2017-02-19 14:39:15 +08:00
daiao 77f58d76a5 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop 
# Conflicts:
#	db/schema.rb
 2017-02-19 09:21:55 +08:00
huang d4eb4c0d56 实训任务模块 2017-02-17 19:29:00 +08:00
cxt c1301bbd7d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-17 15:02:24 +08:00
cxt b81d9b86c4 班级的配置页面，管理员增加“更换管理员”功能 2017-02-17 15:00:14 +08:00
cxt aefd4973c2 在线测验的新建、编辑改版 2017-02-17 09:03:43 +08:00