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

2279 Commits

Author SHA1 Message Date
daiao fa73a3618c 实训提交评测60S超时 2017-03-24 19:49:43 +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
cxt 324d14ee92 新版登录和注册 2017-03-24 16:05:52 +08:00
huang 2326e25dba 开启实训前的一些提示 2017-03-24 10:15:49 +08:00
huang 563febc7c4 完成上线关 2017-03-20 11:25:15 +08:00
cxt 43331b526c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_bigdata 2017-03-20 09:33:50 +08:00
huang a5d6ca7cad ajax相关路由 2017-03-19 14:44:58 +08:00
cxt f520d641ab 更新设置了延期发布的班级资源时，延期发布设置会丢失，且没有提醒 2017-03-17 13:55:21 +08:00
huang d021dbb522 编辑 上移 下移动功能 2017-03-16 17:32:20 +08:00
huang 28cf382576 output局部刷新 
权限显示控制
 2017-03-15 17:57:10 +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 19456503da next方法封装 2017-03-14 18:11:26 +08:00
huang c069279105 myshixuns 版本库entry 2017-03-14 10:08:49 +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 63881869f6 game局部显示版本库路由及相关action 2017-03-13 17:39:27 +08:00
huang 6183db782a games模块开发 2017-03-10 15:41:44 +08:00
daiao a9fb270b54 问吧的帖子，吧主和超级管理员有置顶权限 2017-03-09 16:42:30 +08:00
huang 8526c409b5 build输出结果记录 2017-03-09 14:51:39 +08:00
huang fc91dce7ba 实训任务build 2017-03-08 17:16:05 +08:00
huang 622b7a4979 TPI开启任务模块 2017-03-08 14:59:40 +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 ca118e2bef 版本库分离 2017-03-06 14:56:34 +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
cxt f30507b6f0 在线测验改版 2017-03-03 14:43:51 +08:00
huang c14840ef83 实训项目基础框架搭建及相关关联 2017-03-02 15:44:56 +08:00
daiao 20cc376246 注册激活页面的更换邮箱，更换一次之后，第二次弹框显示的原邮箱不正确 2017-03-01 15:51:12 +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 0e40bf6daf 题库改版 2017-02-24 10:32:48 +08:00
huang 9a3793ffa9 完成training_task 编辑功能 2017-02-23 10:45:28 +08:00
daiao 8d51e896fa Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 09:32:36 +08:00
daiao fa7b15db47 注册成功提示页与账号未激活提示页，增加‘更换邮箱的功能’ 2017-02-23 09:32:13 +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
huang 96aa9b7261 实训项目一些调整，api和结构 2017-02-22 08:54:38 +08:00
daiao 4a925201eb 实训任务增加二级回复功能 2017-02-21 17:23:44 +08:00
daiao 818d7ad2ef Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-21 14:38:32 +08:00
daiao 544432adce 实训任务详情页面的一级回复功能 2017-02-21 14:38:05 +08:00
huang f59243ab9f 实训api改进及一些提醒 2017-02-21 14:34:17 +08:00
huang 8d1987567e 实训项目相关模块相关api的开发 2017-02-19 17:49:58 +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 a43c5cdb2f 启动实训Api等 2017-02-18 17:44:50 +08:00
huang d4eb4c0d56 实训任务模块 2017-02-17 19:29:00 +08:00
cxt b81d9b86c4 班级的配置页面，管理员增加“更换管理员”功能 2017-02-17 15:00:14 +08:00
daiao 3e705fabb8 平台底部调整（去除底部图片，增加合作伙伴一栏） 2017-02-09 10:47:18 +08:00
ccccx 45453a9857 Merge branch 'develop' into dev_bigdata 
Conflicts:
	app/views/layouts/_logined_header.html.erb
	app/views/layouts/base_courses.html.erb
 2017-01-23 21:01:07 +08:00
huang 2009520c7a 首页改版 2017-01-23 15:44:09 +08:00