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

2219 Commits

Author SHA1 Message Date
huang dd9b7e95ca mirror 编辑器 2017-03-19 15:38:48 +08:00
huang 0263165c2b game中任务任务自动功能 
ajax局部实现show and index
 2017-03-17 12:42:58 +08:00
daiao 59d153d131 实训tpi 2017-03-16 17:07:23 +08:00
daiao c2c8852142 tpi左侧导航点tab样式添加 2017-03-16 17:03:44 +08:00
huang a6d8f6834a top公共部分封装 2017-03-16 14:44:57 +08:00
huang 3e870f115b css加载顺序 路由链接 2017-03-16 14:40:55 +08:00
huang 45911e770e 定义当前任务 2017-03-16 14:20:41 +08:00
huang 61db8041a4 输出结果关联 2017-03-16 10:26:02 +08:00
daiao d2bb822d84 新建阶段样例设置-添加样式输入与输出 2017-03-15 17:19:26 +08:00
huang a894e6c932 实训base权限控制 2017-03-14 15:14:03 +08:00
huang 6d55409a85 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-14 14:56:33 +08:00
huang 5992bcc128 版本库文件局部刷新 2017-03-14 14:56:08 +08:00
daiao 0b82b3e994 TPM实训index页面 2017-03-14 14:39:05 +08:00
huang 38ff90a8bf myshixun模板 2017-03-14 11:25:01 +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 6183db782a games模块开发 2017-03-10 15:41:44 +08:00
huang 4b825ecd22 challenge列表页面 2017-03-07 13:43:21 +08:00
huang dd31a55bdd Merge branch 'develop' into dev_shixun_project 
Conflicts:
	db/schema.rb
 2017-03-07 09:32:40 +08:00
cxt 95595c6fe6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2017-03-03 15:37:55 +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 138a342613 首页左侧导航栏的底部地区为空时，不显示 2017-03-02 13:41:17 +08:00
daiao f15d00f0bd 新建项目如果描述为空的时候显示怪异 2017-03-01 09:40:20 +08:00
daiao 7fbfeef8f3 首页显示的个人信息区域需要更新显示 2017-02-28 15:24:28 +08:00
huang f459609c81 解决实训任务验证问题 用户名后添加导师 2017-02-25 11:08:37 +08:00
huang b510994365 竞赛添加访问统计 2017-02-24 19:42:23 +08:00
daiao f4ea11c4c2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-24 16:20:38 +08:00
daiao d05b3419d7 项目列表样式调整 2017-02-24 16:20:12 +08:00
黄井泉 af959a1260 Merge branch 'develop' into 'develop' 
本周上线任务



See merge request !156
 2017-02-24 15:35:17 +08:00
huang c613e29299 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-24 15:33:51 +08:00
huang bd0bd02084 权限控制 2017-02-24 15:33:15 +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 01484701d2 竞赛首页的简介下方直接显示竞赛动态 2017-02-24 15:14:09 +08:00
daiao 91017041ac 组织底部导航修改 2017-02-24 15:06:48 +08:00
huang 2e81633308 TPM TPi权限控制 2017-02-24 14:46:29 +08:00
huang 6e96f6e9ec Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-24 13:52:18 +08:00
huang 6e9ef8ee12 Merge branch 'develop' into dev_raining 
Conflicts:
	app/controllers/repositories_controller.rb
	app/views/layouts/_base_project_top.html.erb
 2017-02-24 10:26:22 +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 3f105cefe7 版本库访问权限控制清理 2017-02-22 12:33:45 +08:00
cxt da4aaca1ea 消息首页报500 2017-02-22 12:26:56 +08:00
cxt 422b5ffa95 首页申请加入竞赛的消息报500 2017-02-22 10:01:54 +08:00
huang 96aa9b7261 实训项目一些调整，api和结构 2017-02-22 08:54:38 +08:00
Linda 81ac923e3b Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-21 14:57:49 +08:00
Linda 7451838509 syllablus.css和sy.public.css简化转移到 css文件夹；修改页面中引用这两个样式的路径 2017-02-21 14:51:48 +08:00
huang f59243ab9f 实训api改进及一些提醒 2017-02-21 14:34:17 +08:00
huang d21350b754 tpi先建任务权限判断 2017-02-20 14:39:39 +08:00
huang 336c28ccdb 实训项目权限控制 2017-02-20 12:33:27 +08:00
Linda 54eb9b0bca 网站底部版权信息居中 2017-02-20 10:48:36 +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