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

1375 Commits

Author SHA1 Message Date
cxt 076c241d10 实训 2017-04-01 10:55:46 +08:00
huang 2db5997363 添加文件路径 2017-03-24 17:06:22 +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
Linda 587b4b73e0 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-24 15:43:02 +08:00
huang b3141348b0 版本库默认打开设置文件 2017-03-24 14:42:10 +08:00
Linda 82fdb9c867 导航选中样式修改 
新建实训选中提示修改
 2017-03-24 14:05:47 +08:00
huang 8006237d16 修改测试用例类型 2017-03-23 16:35:18 +08:00
huang aebdd278a5 下一关修复 2017-03-22 16:21:57 +08:00
daiao 5f2a9869f9 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-22 14:24:42 +08:00
daiao 2a90ed3a42 实训任务 2017-03-22 14:24:22 +08:00
huang 4d23032937 实训详情 2017-03-22 13:45:01 +08:00
huang 76a630c6be 公共方法的封装 2017-03-21 20:06:39 +08:00
huang 48913a3c8c 公共方法封装 2017-03-20 14:51:07 +08:00
daiao cb683878dd 实训tpm的新建tag 2017-03-17 13:49:57 +08:00
huang 0263165c2b game中任务任务自动功能 
ajax局部实现show and index
 2017-03-17 12:42:58 +08:00
daiao a83f8351b2 实训tpi页面调整 2017-03-16 14:46:11 +08:00
huang 45911e770e 定义当前任务 2017-03-16 14:20:41 +08:00
daiao d0a7befebf 实训任务新建 2017-03-16 11:22:20 +08:00
huang 61db8041a4 输出结果关联 2017-03-16 10:26:02 +08:00
daiao 8f2a040fee 实训配置界面 2017-03-15 15:15:55 +08:00
huang df1b1484f8 新建相关关联 2017-03-14 17:10:32 +08:00
guange 606e431396 集成云片的短信发送功能 2017-03-12 16:53:47 +08:00
huang 6183db782a games模块开发 2017-03-10 15:41:44 +08:00
huang 8526c409b5 build输出结果记录 2017-03-09 14:51:39 +08:00
cxt 42ab249651 小铃铛的数字标识和事情情况有冲突 2017-03-09 10:58:46 +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 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 4688fbaec9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-03 14:45:17 +08:00
cxt f30507b6f0 在线测验改版 2017-03-03 14:43:51 +08:00
daiao 90f0dc47b8 超级管理员的待审批申请中，更改申请高校名称后，依然在待审批消息中显示 2017-03-03 11:13:00 +08:00
huang c14840ef83 实训项目基础框架搭建及相关关联 2017-03-02 15:44:56 +08:00
huang 7763ce0d66 添加数据 2017-02-28 21:56:39 +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 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 0e40bf6daf 题库改版 2017-02-24 10:32:48 +08:00
Linda e1be2fda81 实训任务提交测评显示状态增加样式 2017-02-23 10:25:55 +08:00
daiao c115fad8a1 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 
Conflicts:
	db/schema.rb
 2017-02-20 14:09:59 +08:00
daiao 8039f89d92 实训项目的列表页面 2017-02-20 14:08:48 +08:00
Linda 72f085e13e Merge branch 'develop' into dev_raining 
Conflicts:
	db/migrate/20170219062646_add_positon_to_training_task.rb
	db/schema.rb
 2017-02-20 10:15:47 +08:00
huang 8d1987567e 实训项目相关模块相关api的开发 2017-02-19 17:49:58 +08:00
Linda 89dc320027 合作伙伴图片 及项目管理脚本录入界面 2017-02-19 15:28:57 +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