Commit Graph

913 Commits

Author SHA1 Message Date
huang 8d54187e04 周五内容 2017-03-03 18:49:56 +08:00
huang c14840ef83 实训项目基础框架搭建及相关关联 2017-03-02 15:44:56 +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
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
cxt 65bfaedb3a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2017-01-20 13:56:34 +08:00
cxt ac80805932 班级统计功能(暂未完成) 2017-01-20 10:16:51 +08:00
daiao 6619ee9c20 开源检索功能 2017-01-20 09:52:10 +08:00
daiao a2aea42868 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-19 15:57:55 +08:00
huang 55d16eb589 完成组织域名申请消息重构 2017-01-17 13:22:03 +08:00
cxt 9ccef85600 班级留言改版 2017-01-16 16:34:51 +08:00
daiao 10ed174801 全部设为已读优化 2017-01-13 18:51:34 +08:00
黄井泉 c177230b08 Merge branch 'develop' into 'develop'
这周上线任务



See merge request !122
2017-01-13 11:24:07 +08:00
cxt cd23ba37b5 作业评价时,此次评价会覆盖该账号上传评价的信息,请在评分详情的页面上增加历史评分的隐藏功能 2017-01-12 17:25:16 +08:00
cxt 231fa56c49 管理员界面增加竞赛列表 2017-01-11 16:45:41 +08:00
cxt c44af451ce 竞赛增加留言模块 2017-01-11 10:16:25 +08:00
huang a365453f9c trustie平台输入版本库地址让其跳入Trustie项目版本库 2017-01-10 14:49:50 +08:00
cxt fe24382157 竞赛的成员配置页,增加“单位名称”的显示,同时增加excel导出功能 2017-01-10 11:00:18 +08:00
cxt cc4d46c3ee Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/css/common.css
2017-01-06 15:06:22 +08:00
cxt 44e1a09906 竞赛图片上传 2017-01-06 15:03:01 +08:00
daiao 5cc362e6eb 我收到的作业 2017-01-05 10:14:56 +08:00
daiao e43ef02d57 我发布的作业 2017-01-05 09:06:41 +08:00
cxt 9f62c3d22a 竞赛相关消息通知的完善 2017-01-04 15:53:36 +08:00
daiao 82a253765c 我收到的issues 2017-01-04 13:33:01 +08:00
cxt 59853b1558 竞赛的管理员、评委、参赛者列表 2017-01-03 17:05:27 +08:00
daiao 2a8cd2d935 我发布的issue(未完) 2017-01-03 15:42:37 +08:00
daiao fbfbc0cdeb 问吧样式调整 2016-12-30 21:05:14 +08:00
huang 17d4e45acc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/layouts/_logined_header.html.erb
2016-12-30 17:33:18 +08:00
huang baaaaf95d8 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba
Conflicts:
	config/routes.rb
2016-12-30 16:51:23 +08:00
cxt cde8a8957c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-30 16:37:43 +08:00
daiao f332307cae 更改贴吧描述 2016-12-30 16:12:25 +08:00
cxt 738db43f34 具体竞赛页的邀请码tip没有显示、竞赛菜单的“暂停加入”和“删除” 2016-12-30 11:18:29 +08:00
cxt 73350e34f1 竞赛作品的相关设置 2016-12-30 10:30:21 +08:00
huang f733e2a276 注册激活页面代码重构,及添加新的字体 2016-12-29 14:38:03 +08:00
黄井泉 8e2353d61e Merge branch 'develop' into 'develop'
新建/编辑里程碑,名字相同时提示更改;课程的资源库动态无法被筛选;待审批消息旧数据依旧存在的问题

新建/编辑里程碑,名字相同时提示更改;课程的资源库动态无法被筛选;待审批消息旧数据依旧存在的问题

See merge request !88
2016-12-27 16:27:19 +08:00